diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
index e7f6de7..96411d5 100644
--- a/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/activity/activityList.jsp
@@ -52,7 +52,7 @@
 				
 			</tbody>
 		</table>
-		<div class="nulldata">暂无数据</div>
+		<div class="nodata">暂无数据</div>
 		<div id="page"></div>
 
 	</body>
@@ -92,13 +92,6 @@
 	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
 	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
 	<script>
-		// 百度地图API功能
-		var map = new BMap.Map("allmap");
-		map.centerAndZoom("重庆", 12);
-		//单击获取点击的经纬度
-		map.addEventListener("click", function(e) {
-			alert(e.point.lng + "," + e.point.lat);
-		});
 		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
 			var form = layui.form(),
 				element = layui.element(),
@@ -142,9 +135,9 @@
 					});
 					var str = "";
 					if(data.rows.length < 1) {
-						$(".nulldata").show();
+						$(".nodata").show();
 					} else {
-						$(".nulldata").hide();
+						$(".nodata").hide();
 						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>' +
diff --git a/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp b/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp
index 4c0f96d..74245f9 100644
--- a/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp
+++ b/WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp
@@ -39,7 +39,7 @@
 			<tbody id="tablelist">
 			</tbody>
 		</table>
-		<div class="nulldata">暂无数据</div>
+		<div class="nodata">暂无数据</div>
 		<div id="page"></div>
 
 	</body>
@@ -131,9 +131,9 @@
 					
 					var str = "";
 					if(data.rows.length < 1) {
-						$(".nulldata").show();
+						$(".nodata").show();
 					} else {
-						$(".nulldata").hide();
+						$(".nodata").hide();
 						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>' +
diff --git a/WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp b/WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp
index ef9f92b..de07090 100644
--- a/WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp
@@ -53,20 +53,10 @@
 	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
 	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
 	<script>
-		layui.use(['table', 'upload'], function() {
+		layui.use(['table', 'upload', 'layer'], function() {
 			var table = layui.table,
-				upload = layui.upload;
-
-			var list = ${list};
-			console.log(list)
-
-			if(list.length > 0){
-				$(".bannerShow").show()
-				$(".nodata").hide()
-			}else{
-				$(".nodata").show()
-				$(".bannerShow").hide()
-			}
+				upload = layui.upload,
+				layer = layui.layer;
 
 			//上传图片
 			upload.render({
@@ -75,17 +65,35 @@
 				method: 'post',
 				done: function(res) {
 					if(res.code == 0) {
-						$(".bannerShow").show()
-						$(".nodata").hide()
-						var str = '<div class="item">' + '<img src="' + res.data + '" />' + '<i class="layui-icon" id="deleteBtn">&#x1007;</i>' + '</div>';
-						$(".bannerShow").append(str);
+						$.post("/zzhnc/banner/add",{
+							url: res.data
+						}, function(res){
+							console.log(res)
+							if(res.code == 0){
+								$(".bannerShow").show()
+								$(".nodata").hide()
+								var str = '<div class="item">' 
+									+ '<img src="' + res.data + '" />' 
+									+ '<i class="layui-icon" id="deleteBtn">&#x1007;</i>' 
+									+ '</div>';
+								$(".bannerShow").append(str);
+							}
+						})
 					}
 				}
 			});
 			
 			//删除banner图
 			$(document).on("click", "#deleteBtn", function() {
-				$(this).parent().remove();
+				var id = $(this).data("id");
+				$.get("/zzhnc/banner/"+ id +"/delete", "", function(res){
+					console.log(res)
+					if(res.code == 0){
+						layer.alert('删除成功！'); 
+					}else{
+						layer.alert('删除失败！'); 
+					}
+				})
 			})
 
 		})
diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
index 9d68186..4d356b4 100644
--- a/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp
@@ -113,9 +113,9 @@
 					});
 					var str = "";
 					if(data.rows.length < 1) {
-						$(".nulldata").show();
+						$(".nodata").show();
 					} else {
-						$(".nulldata").hide();
+						$(".nodata").hide();
 						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>' +
diff --git a/WebContent/WEB-INF/jsp/pc/index.jsp b/WebContent/WEB-INF/jsp/pc/index.jsp
index e10e4d7..e3a6665 100644
--- a/WebContent/WEB-INF/jsp/pc/index.jsp
+++ b/WebContent/WEB-INF/jsp/pc/index.jsp
@@ -137,11 +137,11 @@
 			<div class="layui-body layui-tab-content site-demo site-demo-body" style="bottom: 0;" id="admin-body">
 				<div class="layui-tab admin-nav-card layui-tab-brief" lay-filter="admin-tab">
 					<ul class="layui-tab-title">
-						<li lay-id="0" class="layui-this"><i class="iconfont icon-xiangmu"></i><cite>商品管理</cite><i class="layui-icon layui-unselect layui-tab-close" data-id="0">ဆ</i></li>
+						<li lay-id="0" class="layui-this"><i class="iconfont icon-xiangmu"></i><cite>首页设置</cite><i class="layui-icon layui-unselect layui-tab-close" data-id="0">ဆ</i></li>
 					</ul>
 					<div class="layui-tab-content" style="min-height: 150px; padding: 0; height: auto;">
 						<div class="layui-tab-item layui-show">
-							<iframe src="/zzhnc/goods/goodsList" target="_self" id="baseIframe" data-id="0"></iframe>
+							<iframe src="/zzhnc/banner/bannerList" target="_self" id="baseIframe" data-id="0"></iframe>
 						</div>
 					</div>
 				</div>
diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeEdit.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeEdit.jsp
deleted file mode 100644
index ed4924f..0000000
--- a/WebContent/WEB-INF/jsp/pc/prize/prizeEdit.jsp
+++ /dev/null
@@ -1,248 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>奖品编辑</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.layui-form-select dl {
-			max-height: 190px;
-		}
-		
-		#allmap {
-			top: 10px;
-			width: 100%;
-			height: 400px;
-			overflow: hidden;
-			margin: 0;
-		}
-	</style>
-
-	<body class="wrap">
-		<div class="layui-form Detailbtn" style="display:block;">
-			<div class="layui-form-item">
-				<label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>项目名称</label>
-				<div class="layui-input-inline" style="width:390px;">
-					<input type="text" name="name" lay-verify="name" placeholder="项目名称" class="layui-input">
-				</div>
-				<div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
-			</div>
-			<div class="layui-form-item">
-				<label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>海报模板</label>
-				<div class="layui-input-inline">
-					<select name="postertempletid" lay-search="">
-						<option value="">全部</option>
-					</select>
-				</div>
-			</div>
-			<div class="layui-form-item">
-				<label class="layui-form-label">位置</label>
-				<!--  <div class="layui-input-inline">
-			      <input type="text" name="lng"  readonly lay-verify="required" placeholder="经度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
-			    </div>
-			    <div class="layui-input-inline">
-			      <input type="text" name="lat" readonly lay-verify="required" placeholder="纬度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
-			    </div> -->
-				<div class="layui-input-inline">
-					<input type="number" name="lng" lay-verify="required" placeholder="经度" class="layui-input">
-				</div>
-				<div class="layui-input-inline">
-					<input type="number" name="lat" lay-verify="required" placeholder="纬度" class="layui-input">
-				</div>
-			</div>
-			<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
-			<div class="layui-form-mid layui-word-aux" style="padding-bottom:0;">提示：可以在地图上点击位置获取坐标（鼠标滚动放大缩小地图）</div>
-			<div id="allmap"></div>
-			<div class="layui-form-item" style="margin-top: 30px;">
-				<button class="layui-btn" lay-submit lay-filter="submit">提交</button>
-				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
-			</div>
-		</div>
-
-	</body>
-
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		// 百度地图API功能
-		var map = new BMap.Map("allmap");
-		var map = new BMap.Map("allmap", {
-			minZoom: 4,
-			maxZoom: 18
-		}); // 创建Map实例,设置地图允许的最小/大级别
-		map.enableScrollWheelZoom(true);
-
-		//单击获取点击的经纬度
-		map.addEventListener("click", function(e) {
-			$("input[name=lng]").val(e.point.lng);
-			$("input[name=lat]").val(e.point.lat);
-			var allOverlay = map.getOverlays();
-			if(allOverlay.length > 0) {
-				function deletePoint() {
-					for(var i = 0; i < allOverlay.length; i++) {
-						map.removeOverlay(allOverlay[i]);
-					}
-				}
-				deletePoint()
-				var point = new BMap.Point(e.point.lng, e.point.lat);
-				var marker = new BMap.Marker(point); // 创建标注
-				map.addOverlay(marker); // 将标注添加到地图中
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-			}
-		});
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-
-			$("input[name=lng],input[name=lat]").blur(function() {
-				var plng = $("input[name=lng]").val();
-				var plat = $("input[name=lat]").val();
-				var allOverlay = map.getOverlays();
-				if(allOverlay.length > 0) {
-					function deletePoint() {
-						for(var i = 0; i < allOverlay.length; i++) {
-							map.removeOverlay(allOverlay[i]);
-						}
-					}
-					deletePoint()
-					var point = new BMap.Point(plng, plat);
-					var marker = new BMap.Marker(point); // 创建标注
-					map.addOverlay(marker); // 将标注添加到地图中
-					marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-
-				}
-			});
-
-			//下拉海报
-			$.post("/zzhnc/poster/getAllPostertemplet", function(data) {
-				console.log(data);
-				var str = "";
-				for(var i = 0; i < data.data.length; i++) {
-					str += '<option value=' + data.data[i].id + '>' + data.data[i].name + '</option>';
-				}
-				$("select[name=postertempletid]").append(str);
-				form.render();
-			})
-			$(".resetBtn").on("click", function() {
-				$("input[name=name]").val("");
-				$("select[name=postertempletid]").val("0");
-				var allOverlay = map.getOverlays();
-				if(allOverlay.length > 0) {
-					function deletePoint() {
-						for(var i = 0; i < allOverlay.length; i++) {
-							map.removeOverlay(allOverlay[i]);
-						}
-					}
-					deletePoint()
-				}
-				$("input[name=lng]").val(113.754653);
-				$("input[name=lat]").val(23.025333);
-				map.centerAndZoom(new BMap.Point(113.754653, 23.025333), 13);
-				var point = new BMap.Point(113.754653, 23.025333);
-				var marker = new BMap.Marker(point); // 创建标注
-				map.addOverlay(marker); // 将标注添加到地图中
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-				form.render();
-			})
-			var id = getUrl_G("id");
-			if(id > 0) {
-				$.post("/zzhnc/project/getProject", {
-					id: id
-				}, function(data) {
-					console.log(data);
-					if(data.code == 0) {
-						$("input[name=name]").val(data.data.name);
-						$("select[name=postertempletid]").val(data.data.postertempletid);
-						$("input[name=lng]").val(data.data.lng);
-						$("input[name=lat]").val(data.data.lat);
-						map.centerAndZoom(new BMap.Point(data.data.lng, data.data.lat), 13);
-						var point = new BMap.Point(data.data.lng, data.data.lat);
-						var marker = new BMap.Marker(point); // 创建标注
-						map.addOverlay(marker); // 将标注添加到地图中
-						marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-						form.render();
-					}
-				})
-
-			} else {
-				$("input[name=lng]").val(113.754653);
-				$("input[name=lat]").val(23.025333);
-				map.centerAndZoom(new BMap.Point(113.754653, 23.025333), 13);
-				var point = new BMap.Point(113.754653, 23.025333);
-				var marker = new BMap.Marker(point); // 创建标注
-				map.addOverlay(marker); // 将标注添加到地图中
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-
-			}
-
-			form.on('submit(submit)', function(data) {
-				var name = $("input[name=name]").val();
-				var templetid = $("select[name=postertempletid]").val();
-				var lng = $("input[name=lng]").val();
-				var lat = $("input[name=lat]").val();
-				if(name == "") {
-					top.layer.msg("请填写项目名称");
-					return false;
-				} else {
-					if(strlen(name) > 40) {
-						top.layer.msg("项目名称不超过20个汉字");
-						return false;
-					}
-				}
-				if(templetid == "" || templetid == "0") {
-					top.layer.msg("请选择海报");
-					return false;
-				}
-
-				if(id > 0) {
-					//修改项目
-					$.post("/zzhnc/project/updateProject", {
-						id: id,
-						name: name,
-						templetid: templetid,
-						lng: lng,
-						lat: lat
-					}, function(data) {
-						console.log(data);
-						if(data.code == 0) {
-							top.layer.msg("修改成功");
-
-						} else {
-							top.layer.msg(data.msg);
-						}
-					})
-				} else {
-					//添加项目
-					$.post("/zzhnc/project/addProject", {
-						name: name,
-						templetid: templetid,
-						lng: lng,
-						lat: lat
-					}, function(data) {
-						console.log(data);
-						if(data.code == 0) {
-							top.layer.msg("添加成功");
-							form.render();
-						} else {
-							top.layer.msg(data.msg);
-						}
-					})
-				}
-				return false;
-
-			});
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
index b74c8fd..0b7d159 100644
--- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
@@ -1,4 +1,5 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 
@@ -6,242 +7,272 @@
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>奖品管理</title>
+		<title>抽奖记录</title>
 		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
 		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.layui-form-select dl {
-			max-height: 190px;
-		}
-		
-		#allmap {
-			top: 10px;
-			width: 100%;
-			height: 200px;
-			overflow: hidden;
-			margin: 0;
-		}
-	</style>
-
-	<body class="wrap">
-		<div class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-
-				<!-- <div class="layui-input-inline producttype" style="width: 140px;">
-					<select name="producttype" >
-						<option value="">项目名称</option>
-					</select>
+		<style>
+			.layui-form-label {
+				width: 100px;
+			}
+			
+			.layui-form-item h4 {
+				line-height: 40px;
+				font-size: 14px;
+				color: 333;
+			}
+			
+			.redpagebox {
+				padding: 10px 100px 0 10px;
+			}
+			
+			.redpagebox .layui-input-block {
+				margin-left: 0;
+			}
+			
+			.red {
+				color: red;
+				margin-right: 5px;
+			}
+		</style>
+		<script src="http://cdn.sockjs.org/sockjs-0.3.min.js"></script>
+
+		<body class="wrap">
+			<form class="layui-form">
+				<div style="width:350px;float:left;">
+					<div class="layui-form-item">
+						<label for="" class="layui-form-label"><i class="red">*</i>活动开启时间 </label>
+						<div class="layui-input-inline">
+							<div class="layui-input-inline">
+								<!--<input type="text" name="begintime" autocomplete="on" id="stTime" placeholder="- 开始时间 -" class="layui-input" lay-verify="required" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm',istime: true})">-->
+								<input type="text" name="beginTime" autocomplete="on" id="stTime" placeholder="- 开始时间 -" class="layui-input" lay-verify="required" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm',istime: true,min:laydate.now(-1)})">
+							</div>
+						</div>
+					</div>
+					<div class="layui-form-item">
+						<label class="layui-form-label"><i class="red">*</i>活动状态</label>
+						<div class="layui-input-inline">
+							<select name="status" lay-verify="required" disabled>
+								<option value="0">请选择状态 </option>
+								<option value="1">未开启 </option>
+								<option value="2"> 进行中</option>
+								<option value="3"> 已结束</option>
+							</select>
+						</div>
+					</div>
+					<div class="layui-form-item">
+						<label class="layui-form-label"><i class="red">*</i>当前轮次</label>
+						<div class="layui-input-inline">
+							<input type="number" name="turn" class="layui-input" readonly />
+						</div>
+					</div>
+					<div class="layui-form-item">
+						<label class="layui-form-label"><i class="red">*</i>发放红包预算 </label>
+						<div class="layui-input-inline">
+							<input type="number" name="planMny" class="layui-input" lay-verify="required" />
+						</div>
+					</div>
+
 				</div>
-				<div class="layui-input-inline productid" style="width: 140px;">
-					<select name="productid">
-						<option value="">海报模板id</option>
-					</select>
+				<div style="float:left;">
+					<div class="layui-form-item">
+						<label class="layui-form-label">红包活动范围 </label>
+						<div class="layui-input-inline">
+							<input type="text" name="city" class="layui-input" />
+						</div>
+					</div>
+
+					<div class="layui-form-item">
+						<label class="layui-form-label">红包中奖概率 </label>
+						<div class="layui-input-inline">
+							<input type="number" name="lotteryPercent" class="layui-input" lay-verify="required" />
+						</div>
+						<div class="layui-input-inline" style="width:20px;padding:9px 0px;">
+							%
+						</div>
+					</div>
+					<div class="layui-form-item">
+						<label class="layui-form-label">已发放红包金额</label>
+						<div class="layui-input-inline">
+							<input type="number" name="currentMny" class="layui-input" readonly />
+						</div>
+						<div class="layui-form-mid layui-word-aux">提示：(该金额为缓存的已发放金额，每个保存会清零，实际发放金额以抽奖记录为准）</div>
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label class="layui-form-label"><i class="red">*</i>红包随机金额 </label>
+					<div class="layui-input-inline" style="width:100px;">
+						<input onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" type="number" name="minMny" class="layui-input" lay-verify="required" min="1">
+						<!-- <input type="number" name="minMny" class="layui-input" lay-verify="required" min="1"/> -->
+
+					</div>
+
+					<div class="layui-input-inline" style="width:20px;padding:9px 0px;">
+						至
+					</div>
+					<div class="layui-input-inline" style="width:100px;">
+						<input type="number" name="maxMny" class="layui-input" lay-verify="required" min="1" />
+					</div>
+					<div class="layui-input-inline" style="width:20px;padding:9px 0px;">
+						分
+					</div>
+					<div class="layui-form-mid layui-word-aux">提示：只能输入正整数</div>
 				</div>
-				<div class="layui-input-inline" style="width: 150px;">
-					<input name="date1" class="layui-input" placeholder="更新时间" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm:ss',istime: true})" />
-				</div> -->
-				<div class="layui-input-inline" style="width: 140px;">
-					<input type="text" class="layui-input" name="keyword" placeholder="关键字" />
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label"></label>
+					<a class="layui-btn" lay-submit="" lay-filter="submit">保存</a>
+					<button class="layui-btn" lay-submit lay-filter="status2">立即开启活动</button>
+					<button class="layui-btn" lay-submit lay-filter="status3">立即结束活动</button>
+					<button class="layui-btn" lay-submit lay-filter="nextround">开启下一轮</button>
 				</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>
-			</div>
-		</div>
-
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width: 30px;">No</th>
-					<th style="min-width:120px;">项目名称</th>
-					<th style="min-width: 80px;">经度</th>
-					<th style="min-width: 80px;">纬度</th>
-					<th style="min-width: 80px;">海报模板id</th>
-					<th style="min-width: 80px;">更新时间</th>
-					<th style="min-width: 80px;">操作</th>
-				</tr>
-			</thead>
-
-			<tbody id="tablelist">
-				<!-- 	<tr>
-					<td>1</td>
-					<td>项目名称</td>
-					<td>经度</td>
-					<td>纬度</td>
-					<td>海报模板id</td>
-					<td>更新时间</td>
-					<td>
-						<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>
-						<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>
-					</td>
-				</tr> -->
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-
-	</body>
-	<form class="layui-form Detailbtn">
-		<div class="layui-form-item">
-			<label class="layui-form-label">项目名称</label>
-			<div class="layui-input-inline" style="width:390px;">
-				<input type="text" name="name" lay-verify="required" placeholder="项目名称" class="layui-input">
-			</div>
-		</div>
-		<div class="layui-form-item">
-			<label class="layui-form-label">海报模板id</label>
-			<div class="layui-input-inline">
-				<select name="postertempletid" lay-verify="required">
-					<option value=""></option>
-					<option value="0">1</option>
-					<option value="1">2</option>
-					<option value="2">3</option>
-					<option value="3">4</option>
-					<option value="4">5</option>
-				</select>
-			</div>
-		</div>
-		<div class="layui-form-item">
-			<label class="layui-form-label">位置</label>
-			<div class="layui-input-inline">
-				<input type="text" name="lng" lay-verify="required" placeholder="经度" class="layui-input">
-			</div>
-			<div class="layui-input-inline">
-				<input type="text" name="lat" lay-verify="required" placeholder="纬度" class="layui-input">
-			</div>
-			<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
-			<div id="allmap"></div>
-		</div>
-	</form>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		// 百度地图API功能
-		var map = new BMap.Map("allmap");
-		map.centerAndZoom("重庆", 12);
-		//单击获取点击的经纬度
-		map.addEventListener("click", function(e) {
-			alert(e.point.lng + "," + e.point.lat);
-		});
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-			var page = 1;
-			var keyword = "";
-			//查询
-			form.on('submit(querybtn)', function(data) {
-				var keyword = $("input[name=keyword]").val();
-				Initdata(page, keyword)
-			});
-			$(".resetBtn").on("click", function() {
-				$("input[name=keyword]").val("");
-				Initdata(page, keyword)
-			})
-			//初始化数据
-			Initdata(page, keyword);
-
-			function Initdata(page, keyword) {
-
-				$.post("/zzhnc/project/getProjectList", {
-					page: page,
-					keyword: keyword
-				}, function(data) {
-					data = data.data;
-					console.log(data)
-					laypage({
-						cont: 'page',
-						pages: data.totalPages, //总页数
-						curr: page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								page = obj.curr
-								Initdata(page, keyword);
-							}
+			</form>
+		</body>
 
-						}
-					});
-					var str = "";
-					if(data.rows.length < 1) {
-						$(".nulldata").show();
+		<script src='/zzhnc/res/js/jquery.min.js'></script>
+		<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
+		<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+		<script>
+			layui.use(['form', 'element', 'laydate', 'layer', 'laypage', 'layedit'], function() {
+				var form = layui.form,
+					element = layui.element,
+					laydate = layui.laydate,
+					layer = layui.layer,
+					laypage = layui.laypage;
+
+				form.render()
+
+				$.post("/zzhnc/activity/getActivitySetting", function(data) {
+					console.log(data);
+					if(data.code == 0) {
+						var lop = (data.data.lotteryPercent);
+						$("input[name=beginTime]").val(toTime_G(data.data.beginTime));
+						$("select[name=status]").val(data.data.status);
+						$("input[name=planMny]").val(data.data.planMny);
+						$("input[name=currentMny]").val(data.data.currentMny.toFixed(2));
+						$("input[name=turn]").val(data.data.turn)
+						$("input[name=city]").val(data.data.city);
+						$("input[name=lotteryPercent]").val(lop);
+						$("input[name=minMny]").val(data.data.minMny);
+						$("input[name=maxMny]").val(data.data.maxMny);
+						$("input[name=keyword]").val(data.data.keyword);
+						$("textarea[name=replyWelcome]").val(data.data.replyWelcome);
+						$("input[name=replyWait]").val(data.data.replyWait);
+						$("input[name=replySucceed]").val(data.data.replySucceed);
+						$("input[name=unLotteryReply]").val(data.data.unLotteryReply);
+						$("input[name=replyFailed2]").val(data.data.replyFailed2);
+						$("input[name=finishReply]").val(data.data.finishReply);
+						$("input[name=lotteryTitle]").val(data.data.lotteryTitle);
+						$("input[name=lotterySubTitle]").val(data.data.lotterySubTitle);
+						$("input[name=noChanceReply]").val(data.data.noChanceReply);
+						$("input[name=badWordsReply]").val(data.data.badWordsReply);
+
+						form.render();
 					} else {
-						$(".nulldata").hide();
-						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>' +
-								'<td style="text-align:left;">' + data.rows[i].name + '</td>' +
-								'<td>' + data.rows[i].lng + '</td>' +
-								'<td>' + data.rows[i].lat + '</td>' +
-								'<td>' + data.rows[i].postertempletid + '</td>' +
-								'<td>' + toTime_G(data.rows[i].updatedtime) + '</td>' +
-								'<td>' +
-								'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>' +
-								'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>' +
-								'</td>' +
-								'</tr>';
-						}
+						top.layer.msg(data.msg);
 					}
-
-					$("#tablelist").html(str);
-					toNull_G();
 				})
-			}
 
-			//添加项目
-			$(document).on("click", ".createBtn", function() {
-				if(parent.tab.exists("添加项目") > 0) {
-					var tabid = parent.tab.getTabId("添加项目");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/project/projectEdit?id=0",
-					icon: "fa-cubes",
-					title: "添加项目"
-				});
-			})
-			//修改项目
-			$(document).on("click", ".updataBtn", function() {
-				var id = $(this).parents("tr").attr("data-id");
-				if(parent.tab.exists("修改项目") > 0) {
-					var tabid = parent.tab.getTabId("修改项目");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/project/projectEdit?id=" + id,
-					icon: "fa-cubes",
-					title: "修改项目"
-				});
-			})
-			//删除项目
-			$(document).on("click", ".deleteBtn", function() {
-				var id = $(this).parents("tr").attr("data-id");
-				layer.confirm('您确定要删除该项目吗？', {
-					btn: ['确定', '取消'] //按钮
-				}, function(index, layero) {
-					$.post("/zzhnc/project/deleteProject", {
-						id: id
-					}, function(data) {
-						console.log(data)
+				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(data);
 						if(data.code == 0) {
-							top.layer.msg("删除成功");
-							Initdata(1, keyword)
-							layer.close(index);
+							top.layer.msg("修改成功");
 						} else {
 							top.layer.msg(data.msg);
 						}
 					})
+				});
+
+				//立即开始
+				form.on('submit(status2)', function(e) {
+					var status = $("select[name=status]").val();
+					console.log(status)
+					if(status == "1") {
+						$.post("/zzhnc/activity/updateActivityStatus", {
+							status: "2"
+						}, function(data) {
+							console.log(data);
+							if(data.code == 0) {
+								top.layer.msg("开启活动成功");
+
+							} else {
+								top.layer.msg(data.msg);
+							}
+						})
+					} else {
+						top.layer.msg("只有未开启的活动才可以开启");
+					}
+				});
+
+				//立即结束
+				form.on('submit(status3)', function(e) {
+					var status = $("select[name=status]").val();
+					if(status == "2") {
+						$.post("/zzhnc/activity/updateActivityStatus", {
+							status: "3"
+						}, function(data) {
+							console.log(data);
+							if(data.code == 0) {
+								top.layer.msg("设置活动结束成功");
+
+							} else {
+								top.layer.msg(data.msg);
+							}
+						})
+					} else {
+						top.layer.msg("只有进行中的活动可以结束");
+					}
 
-				}, function(index, layero) {
-					layer.close(index);
 				});
-			});
+				//设置下一轮
+				form.on('submit(nextround)', function(e) {
+
+					var status = $("select[name=status]").val();
+					if(status == "3") {
+						$.post("/zzhnc/activity/clearActivity", function(data) {
+							console.log(data);
+							if(data.code == 0) {
+								top.layer.msg("开启下一轮成功");
+
+							} else {
+								top.layer.msg(data.msg);
+							}
+						})
+					} else {
+						top.layer.msg("活动结束后才能开启下一轮");
+					}
+
+				});
+
+			})
+
+			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>
 
-		})
-	</script>
+		<!-- 配置文件 -->
+		<script type="text/javascript" src="/zzhnc/res/UE/ueditor.config.js"></script>
+		<!-- 编辑器源码文件 -->
+		<script type="text/javascript" src="/zzhnc/res/UE/ueditor.all.js"></script>
+		<!-- 实例化编辑器 -->
 
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/seller/sellerEdit.jsp b/WebContent/WEB-INF/jsp/pc/seller/sellerEdit.jsp
deleted file mode 100644
index ed4924f..0000000
--- a/WebContent/WEB-INF/jsp/pc/seller/sellerEdit.jsp
+++ /dev/null
@@ -1,248 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>奖品编辑</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.layui-form-select dl {
-			max-height: 190px;
-		}
-		
-		#allmap {
-			top: 10px;
-			width: 100%;
-			height: 400px;
-			overflow: hidden;
-			margin: 0;
-		}
-	</style>
-
-	<body class="wrap">
-		<div class="layui-form Detailbtn" style="display:block;">
-			<div class="layui-form-item">
-				<label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>项目名称</label>
-				<div class="layui-input-inline" style="width:390px;">
-					<input type="text" name="name" lay-verify="name" placeholder="项目名称" class="layui-input">
-				</div>
-				<div class="layui-form-mid layui-word-aux">不超过20个汉字</div>
-			</div>
-			<div class="layui-form-item">
-				<label class="layui-form-label"><i style="color:red;margin-right:5px;">*</i>海报模板</label>
-				<div class="layui-input-inline">
-					<select name="postertempletid" lay-search="">
-						<option value="">全部</option>
-					</select>
-				</div>
-			</div>
-			<div class="layui-form-item">
-				<label class="layui-form-label">位置</label>
-				<!--  <div class="layui-input-inline">
-			      <input type="text" name="lng"  readonly lay-verify="required" placeholder="经度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
-			    </div>
-			    <div class="layui-input-inline">
-			      <input type="text" name="lat" readonly lay-verify="required" placeholder="纬度"  class="layui-input" style="background-color:#f5f5f5;color:#666;">
-			    </div> -->
-				<div class="layui-input-inline">
-					<input type="number" name="lng" lay-verify="required" placeholder="经度" class="layui-input">
-				</div>
-				<div class="layui-input-inline">
-					<input type="number" name="lat" lay-verify="required" placeholder="纬度" class="layui-input">
-				</div>
-			</div>
-			<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
-			<div class="layui-form-mid layui-word-aux" style="padding-bottom:0;">提示：可以在地图上点击位置获取坐标（鼠标滚动放大缩小地图）</div>
-			<div id="allmap"></div>
-			<div class="layui-form-item" style="margin-top: 30px;">
-				<button class="layui-btn" lay-submit lay-filter="submit">提交</button>
-				<button class="layui-btn layui-btn-primary resetBtn">重置</button>
-			</div>
-		</div>
-
-	</body>
-
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		// 百度地图API功能
-		var map = new BMap.Map("allmap");
-		var map = new BMap.Map("allmap", {
-			minZoom: 4,
-			maxZoom: 18
-		}); // 创建Map实例,设置地图允许的最小/大级别
-		map.enableScrollWheelZoom(true);
-
-		//单击获取点击的经纬度
-		map.addEventListener("click", function(e) {
-			$("input[name=lng]").val(e.point.lng);
-			$("input[name=lat]").val(e.point.lat);
-			var allOverlay = map.getOverlays();
-			if(allOverlay.length > 0) {
-				function deletePoint() {
-					for(var i = 0; i < allOverlay.length; i++) {
-						map.removeOverlay(allOverlay[i]);
-					}
-				}
-				deletePoint()
-				var point = new BMap.Point(e.point.lng, e.point.lat);
-				var marker = new BMap.Marker(point); // 创建标注
-				map.addOverlay(marker); // 将标注添加到地图中
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-			}
-		});
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-
-			$("input[name=lng],input[name=lat]").blur(function() {
-				var plng = $("input[name=lng]").val();
-				var plat = $("input[name=lat]").val();
-				var allOverlay = map.getOverlays();
-				if(allOverlay.length > 0) {
-					function deletePoint() {
-						for(var i = 0; i < allOverlay.length; i++) {
-							map.removeOverlay(allOverlay[i]);
-						}
-					}
-					deletePoint()
-					var point = new BMap.Point(plng, plat);
-					var marker = new BMap.Marker(point); // 创建标注
-					map.addOverlay(marker); // 将标注添加到地图中
-					marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-
-				}
-			});
-
-			//下拉海报
-			$.post("/zzhnc/poster/getAllPostertemplet", function(data) {
-				console.log(data);
-				var str = "";
-				for(var i = 0; i < data.data.length; i++) {
-					str += '<option value=' + data.data[i].id + '>' + data.data[i].name + '</option>';
-				}
-				$("select[name=postertempletid]").append(str);
-				form.render();
-			})
-			$(".resetBtn").on("click", function() {
-				$("input[name=name]").val("");
-				$("select[name=postertempletid]").val("0");
-				var allOverlay = map.getOverlays();
-				if(allOverlay.length > 0) {
-					function deletePoint() {
-						for(var i = 0; i < allOverlay.length; i++) {
-							map.removeOverlay(allOverlay[i]);
-						}
-					}
-					deletePoint()
-				}
-				$("input[name=lng]").val(113.754653);
-				$("input[name=lat]").val(23.025333);
-				map.centerAndZoom(new BMap.Point(113.754653, 23.025333), 13);
-				var point = new BMap.Point(113.754653, 23.025333);
-				var marker = new BMap.Marker(point); // 创建标注
-				map.addOverlay(marker); // 将标注添加到地图中
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-				form.render();
-			})
-			var id = getUrl_G("id");
-			if(id > 0) {
-				$.post("/zzhnc/project/getProject", {
-					id: id
-				}, function(data) {
-					console.log(data);
-					if(data.code == 0) {
-						$("input[name=name]").val(data.data.name);
-						$("select[name=postertempletid]").val(data.data.postertempletid);
-						$("input[name=lng]").val(data.data.lng);
-						$("input[name=lat]").val(data.data.lat);
-						map.centerAndZoom(new BMap.Point(data.data.lng, data.data.lat), 13);
-						var point = new BMap.Point(data.data.lng, data.data.lat);
-						var marker = new BMap.Marker(point); // 创建标注
-						map.addOverlay(marker); // 将标注添加到地图中
-						marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-						form.render();
-					}
-				})
-
-			} else {
-				$("input[name=lng]").val(113.754653);
-				$("input[name=lat]").val(23.025333);
-				map.centerAndZoom(new BMap.Point(113.754653, 23.025333), 13);
-				var point = new BMap.Point(113.754653, 23.025333);
-				var marker = new BMap.Marker(point); // 创建标注
-				map.addOverlay(marker); // 将标注添加到地图中
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-
-			}
-
-			form.on('submit(submit)', function(data) {
-				var name = $("input[name=name]").val();
-				var templetid = $("select[name=postertempletid]").val();
-				var lng = $("input[name=lng]").val();
-				var lat = $("input[name=lat]").val();
-				if(name == "") {
-					top.layer.msg("请填写项目名称");
-					return false;
-				} else {
-					if(strlen(name) > 40) {
-						top.layer.msg("项目名称不超过20个汉字");
-						return false;
-					}
-				}
-				if(templetid == "" || templetid == "0") {
-					top.layer.msg("请选择海报");
-					return false;
-				}
-
-				if(id > 0) {
-					//修改项目
-					$.post("/zzhnc/project/updateProject", {
-						id: id,
-						name: name,
-						templetid: templetid,
-						lng: lng,
-						lat: lat
-					}, function(data) {
-						console.log(data);
-						if(data.code == 0) {
-							top.layer.msg("修改成功");
-
-						} else {
-							top.layer.msg(data.msg);
-						}
-					})
-				} else {
-					//添加项目
-					$.post("/zzhnc/project/addProject", {
-						name: name,
-						templetid: templetid,
-						lng: lng,
-						lat: lat
-					}, function(data) {
-						console.log(data);
-						if(data.code == 0) {
-							top.layer.msg("添加成功");
-							form.render();
-						} else {
-							top.layer.msg(data.msg);
-						}
-					})
-				}
-				return false;
-
-			});
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/seller/sellerList.jsp b/WebContent/WEB-INF/jsp/pc/seller/sellerList.jsp
deleted file mode 100644
index b74c8fd..0000000
--- a/WebContent/WEB-INF/jsp/pc/seller/sellerList.jsp
+++ /dev/null
@@ -1,247 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>奖品管理</title>
-		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
-		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
-	</head>
-	<style>
-		.layui-form-select dl {
-			max-height: 190px;
-		}
-		
-		#allmap {
-			top: 10px;
-			width: 100%;
-			height: 200px;
-			overflow: hidden;
-			margin: 0;
-		}
-	</style>
-
-	<body class="wrap">
-		<div class="layui-form">
-			<div class="layui-form-item searchbox" style="margin-bottom: 0px;">
-
-				<!-- <div class="layui-input-inline producttype" style="width: 140px;">
-					<select name="producttype" >
-						<option value="">项目名称</option>
-					</select>
-				</div>
-				<div class="layui-input-inline productid" style="width: 140px;">
-					<select name="productid">
-						<option value="">海报模板id</option>
-					</select>
-				</div>
-				<div class="layui-input-inline" style="width: 150px;">
-					<input name="date1" class="layui-input" placeholder="更新时间" onclick="layui.laydate({elem: this,format: 'YYYY-MM-DD hh:mm:ss',istime: true})" />
-				</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>
-				<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>
-			</div>
-		</div>
-
-		<table class="layui-table">
-			<thead>
-				<tr>
-					<th style="width: 30px;">No</th>
-					<th style="min-width:120px;">项目名称</th>
-					<th style="min-width: 80px;">经度</th>
-					<th style="min-width: 80px;">纬度</th>
-					<th style="min-width: 80px;">海报模板id</th>
-					<th style="min-width: 80px;">更新时间</th>
-					<th style="min-width: 80px;">操作</th>
-				</tr>
-			</thead>
-
-			<tbody id="tablelist">
-				<!-- 	<tr>
-					<td>1</td>
-					<td>项目名称</td>
-					<td>经度</td>
-					<td>纬度</td>
-					<td>海报模板id</td>
-					<td>更新时间</td>
-					<td>
-						<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>
-						<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>
-					</td>
-				</tr> -->
-			</tbody>
-		</table>
-		<div class="nulldata">暂无数据</div>
-		<div id="page"></div>
-
-	</body>
-	<form class="layui-form Detailbtn">
-		<div class="layui-form-item">
-			<label class="layui-form-label">项目名称</label>
-			<div class="layui-input-inline" style="width:390px;">
-				<input type="text" name="name" lay-verify="required" placeholder="项目名称" class="layui-input">
-			</div>
-		</div>
-		<div class="layui-form-item">
-			<label class="layui-form-label">海报模板id</label>
-			<div class="layui-input-inline">
-				<select name="postertempletid" lay-verify="required">
-					<option value=""></option>
-					<option value="0">1</option>
-					<option value="1">2</option>
-					<option value="2">3</option>
-					<option value="3">4</option>
-					<option value="4">5</option>
-				</select>
-			</div>
-		</div>
-		<div class="layui-form-item">
-			<label class="layui-form-label">位置</label>
-			<div class="layui-input-inline">
-				<input type="text" name="lng" lay-verify="required" placeholder="经度" class="layui-input">
-			</div>
-			<div class="layui-input-inline">
-				<input type="text" name="lat" lay-verify="required" placeholder="纬度" class="layui-input">
-			</div>
-			<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=V45f8fZO8HiU1gLflQdrpv81D4gXKGRH"></script>
-			<div id="allmap"></div>
-		</div>
-	</form>
-	<script src='/zzhnc/res/js/jquery.min.js'></script>
-	<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
-	<script>
-		// 百度地图API功能
-		var map = new BMap.Map("allmap");
-		map.centerAndZoom("重庆", 12);
-		//单击获取点击的经纬度
-		map.addEventListener("click", function(e) {
-			alert(e.point.lng + "," + e.point.lat);
-		});
-		layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
-			var form = layui.form(),
-				element = layui.element(),
-				laydate = layui.laydate,
-				layer = layui.layer,
-				laypage = layui.laypage;
-			var page = 1;
-			var keyword = "";
-			//查询
-			form.on('submit(querybtn)', function(data) {
-				var keyword = $("input[name=keyword]").val();
-				Initdata(page, keyword)
-			});
-			$(".resetBtn").on("click", function() {
-				$("input[name=keyword]").val("");
-				Initdata(page, keyword)
-			})
-			//初始化数据
-			Initdata(page, keyword);
-
-			function Initdata(page, keyword) {
-
-				$.post("/zzhnc/project/getProjectList", {
-					page: page,
-					keyword: keyword
-				}, function(data) {
-					data = data.data;
-					console.log(data)
-					laypage({
-						cont: 'page',
-						pages: data.totalPages, //总页数
-						curr: page,
-						skip: true,
-						jump: function(obj, first) {
-							if(!first) {
-								page = obj.curr
-								Initdata(page, keyword);
-							}
-
-						}
-					});
-					var str = "";
-					if(data.rows.length < 1) {
-						$(".nulldata").show();
-					} else {
-						$(".nulldata").hide();
-						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>' +
-								'<td style="text-align:left;">' + data.rows[i].name + '</td>' +
-								'<td>' + data.rows[i].lng + '</td>' +
-								'<td>' + data.rows[i].lat + '</td>' +
-								'<td>' + data.rows[i].postertempletid + '</td>' +
-								'<td>' + toTime_G(data.rows[i].updatedtime) + '</td>' +
-								'<td>' +
-								'<a href="#" class="layui-btn layui-btn-mini updataBtn">修改</a>' +
-								'<a href="#" class="layui-btn layui-btn-mini deleteBtn">删除</a>' +
-								'</td>' +
-								'</tr>';
-						}
-					}
-
-					$("#tablelist").html(str);
-					toNull_G();
-				})
-			}
-
-			//添加项目
-			$(document).on("click", ".createBtn", function() {
-				if(parent.tab.exists("添加项目") > 0) {
-					var tabid = parent.tab.getTabId("添加项目");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/project/projectEdit?id=0",
-					icon: "fa-cubes",
-					title: "添加项目"
-				});
-			})
-			//修改项目
-			$(document).on("click", ".updataBtn", function() {
-				var id = $(this).parents("tr").attr("data-id");
-				if(parent.tab.exists("修改项目") > 0) {
-					var tabid = parent.tab.getTabId("修改项目");
-					parent.tab.deleteTab(tabid);
-				}
-				parent.tab.tabAdd({
-					href: "/zzhnc/project/projectEdit?id=" + id,
-					icon: "fa-cubes",
-					title: "修改项目"
-				});
-			})
-			//删除项目
-			$(document).on("click", ".deleteBtn", function() {
-				var id = $(this).parents("tr").attr("data-id");
-				layer.confirm('您确定要删除该项目吗？', {
-					btn: ['确定', '取消'] //按钮
-				}, function(index, layero) {
-					$.post("/zzhnc/project/deleteProject", {
-						id: id
-					}, function(data) {
-						console.log(data)
-						if(data.code == 0) {
-							top.layer.msg("删除成功");
-							Initdata(1, keyword)
-							layer.close(index);
-						} else {
-							top.layer.msg(data.msg);
-						}
-					})
-
-				}, function(index, layero) {
-					layer.close(index);
-				});
-			});
-
-		})
-	</script>
-
-</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/res/css/basic.css b/WebContent/WEB-INF/res/css/basic.css
index 09201e7..49957c4 100644
--- a/WebContent/WEB-INF/res/css/basic.css
+++ b/WebContent/WEB-INF/res/css/basic.css
@@ -98,6 +98,35 @@
 	display: none;
 }
 
+/*-------------弹出框-------------*/
+.popupbox {
+	width: 100%;
+}
+.popupbos {
+	background-color: #fff;
+	border-bottom-left-radius: 6px;
+	border-bottom-right-radius: 6px;
+	width: 100%;
+	margin: auto;
+	padding-top: 20px;
+}
+
+.popupbos p {
+	text-align: center;
+	line-height: 30px;
+	margin-top: 10px;
+	margin-bottom: 40px;
+	color: #666;
+}
+.popupbox .layui-form-label {
+	width: 126px;
+}
+
+.layui-table td, .layui-table th{
+	text-align: center;
+}
+
+/*-------------弹出框  end-------------*/
 
 
 
diff --git a/WebContent/WEB-INF/res/plugins/datas/nav.js b/WebContent/WEB-INF/res/plugins/datas/nav.js
index 15398d6..e9c5585 100644
--- a/WebContent/WEB-INF/res/plugins/datas/nav.js
+++ b/WebContent/WEB-INF/res/plugins/datas/nav.js
@@ -1,34 +1,30 @@
-var navs2 = [{
-		"title": "商品管理",
-		"icon": "icon-shangpin",
-		"href": "/zzhnc/goods/goodsList"
-	},
+var navs2 = [       
 	{
-		"title": "首页banner",
+		"title": "首页设置",
 		"icon": "icon-banner",
 		"href": "/zzhnc/banner/bannerList"
 	},
 	{
-		"title": "活动介绍",
+		"title": "文章管理",
 		"icon": "icon-huodong",
 		"href": "/zzhnc/activity/activityList"
 	},
 	{
+		"title": "爆款商品",
+		"icon": "icon-shangpin",
+		"href": "/zzhnc/goods/goodsList"
+	},
+	{
 		"title": "自动回复",
 		"icon": "icon-huifu",
 		"href": "/zzhnc/autoreply/autoresponse"
 	},
 	{
-		"title": "奖品管理",
+		"title": "抽奖管理",
 		"icon": "icon-huodong1",
 		"href": "/zzhnc/prize/prizeList"
 	},
 	{
-		"title": "商家管理",
-		"icon": "icon-icon-yxj-empty-store",
-		"href": "/zzhnc/seller/sellerList"
-	},
-	{
 		"title": "报表",
 		"icon": "icon-xiaoshou",
 		"children":[