diff --git a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
index beff587..e1f0511 100644
--- a/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
+++ b/WebContent/WEB-INF/jsp/pc/goods/goodsEdit.jsp
@@ -15,17 +15,17 @@
 			<form class="layui-form">
 				<div class="layui-form-item">
 					<label class="layui-form-label"><i class="redrequired">*</i>商品名称</label>
-					<div class="layui-input-inline" style="width: 400px;">
+					<div class="layui-input-inline" style="width: 450px;">
 						<input type="text" name="name" lay-verify="required" 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 class="redrequired">*</i>上传主图</label>
-					<div class="layui-input-inline" style="width: 400px;">
+					<div class="layui-input-inline" style="width: 450px;">
 						<div class="layui-upload">
 							<button type="button" class="layui-btn" id="uploadImg">上传主图</button>
-							<span class="layui-form-mid layui-word-aux">建议尺寸：200*200，用于首页和列表页面显示</span>
+							<div class="layui-form-mid layui-word-aux">建议尺寸：200*200，用于首页和列表页面显示</div>
 							<div class="layui-upload-list">
 								<img class="layui-upload-img imgPic" src="">
 								<input type="text" style="display:none;" name="imageUrl" lay-verify="required">
@@ -34,11 +34,11 @@
 					</div>
 				</div>
 				<div class="layui-form-item">
-					<label class="layui-form-label"><i class="redrequired">*</i>上传详情图</label>
-					<div class="layui-input-inline" style="width: 400px;">
+					<label class="layui-form-label"><i class="redrequired">*</i>上传banner图</label>
+					<div class="layui-input-inline" style="width: 450px;">
 						<div class="layui-upload">
-							<button type="button" class="layui-btn" id="uploadBanner">上传详情图</button>
-							<span class="layui-form-mid layui-word-aux">建议尺寸：750*440，用于商品详情页显示</span>
+							<button type="button" class="layui-btn" id="uploadBanner">上传banner图</button>
+							<div class="layui-form-mid layui-word-aux">建议尺寸：750*470，用于商品详情页显示</div>
 							<div class="layui-upload-list">
 								<img class="layui-upload-img bannerPic" src="">
 								<input type="text" style="display:none;" name="bannerUrl" lay-verify="required">
@@ -48,7 +48,7 @@
 				</div>
 				<div class="layui-form-item">
 					<label class="layui-form-label"><i class="redrequired">*</i>商品类别</label>
-					<div class="layui-input-inline" style="width: 140px;">
+					<div class="layui-input-inline" style="width: 450px;">
 						<select name="categoryName" lay-verify="required">
 							<option value="">请选择</option>
 							<option value="小商品">小商品</option>
@@ -60,41 +60,41 @@
 				</div>
 				<div class="layui-form-item">
 					<label class="layui-form-label"><i class="redrequired">*</i>商品原价</label>
-					<div class="layui-input-inline" style="width: 100px;">
+					<div class="layui-input-inline" style="width: 130px;">
 						<input type="number" lay-verify="required" name="primePrice" placeholder="商品原价" class="layui-input">
 					</div>
 					<div class="layui-form-mid">元</div>
 					<label class="layui-form-label"><i class="redrequired">*</i>商品现价</label>
-					<div class="layui-input-inline" style="width: 100px;">
+					<div class="layui-input-inline" style="width: 130px;">
 						<input type="number" lay-verify="required" name="price" placeholder="商品现价" class="layui-input">
 					</div>
 					<div class="layui-form-mid">元</div>
 				</div>
 				<div class="layui-form-item">
 					<label class="layui-form-label">是否首页显示</label>
-					<div class="layui-input-inline" style="width: 100px;">
+					<div class="layui-input-inline" style="width: 154px;">
 						<input type="checkbox" checked name="isHome" lay-skin="switch" lay-text="是|否">
 					</div>
 					<label class="layui-form-label">是否爆款</label>
-					<div class="layui-input-inline" style="width: 100px;">
+					<div class="layui-input-inline" style="width: 154px;">
 						<input type="checkbox" checked name="isHot" lay-skin="switch" lay-text="是|否">
 					</div>
 				</div>
 				<div class="layui-form-item">
 					<label class="layui-form-label"><i class="redrequired">*</i>商家名称</label>
-					<div class="layui-input-inline" style="width: 400px;">
+					<div class="layui-input-inline" style="width: 450px;">
 						<input type="text" lay-verify="required" name="sellerName" placeholder="商家名称" class="layui-input">
 					</div>
 				</div>
 				<div class="layui-form-item">
 					<label class="layui-form-label"><i class="redrequired">*</i>商家店铺号</label>
-					<div class="layui-input-inline" style="width: 400px;">
+					<div class="layui-input-inline" style="width: 450px;">
 						<input type="text" lay-verify="required" name="sellerAddress" placeholder="商家店铺号" class="layui-input">
 					</div>
 				</div>
 				<div class="layui-form-item">
 					<label class="layui-form-label">商家电话</label>
-					<div class="layui-input-inline" style="width: 400px;">
+					<div class="layui-input-inline" style="width: 450px;">
 						<input type="text" name="sellerPhone" placeholder="商家电话" class="layui-input">
 					</div>
 				</div>
diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
index 7a8e2a8..d8ce4fe 100644
--- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
@@ -33,6 +33,10 @@
 			    max-width: 50px;
 			    height: auto;
 			}
+			.mainpictrue{
+				width: 100px;
+				height: 100px;
+			}
 		</style>
 
 		<body class="wrap">
@@ -50,8 +54,8 @@
 						<select name="status" lay-verify="required" disabled>
 							<option value="0">请选择状态 </option>
 							<option value="1">未开启 </option>
-							<option value="2"> 进行中</option>
-							<option value="3"> 已结束</option>
+							<option value="2">进行中</option>
+							<option value="3">已结束</option>
 						</select>
 					</div>
 				</div>
@@ -230,7 +234,6 @@
 							<div class="layui-input-inline" style="width:300px;">
 								<input type="text" name="name" class="layui-input" />
 							</div>
-							<div class="layui-form-mid layui-word-aux">(礼品名称在6个字以内)</div>
 						</div>
 					</div>
 				</div>
@@ -292,7 +295,8 @@
 				function prizeList(list) {
 					var str = "";
 					for(var i = 0; i < list.length; i++) {
-						str += '<tr data-id=' + list[i].id + '>' +
+						if(list[i] != null){
+							str += '<tr data-id=' + list[i].id + '>' +
 							'<td>奖品' + (i + 1) + '</td>' +
 							'<td>' + list[i].num + '</td>' +
 							'<td>' + list[i].probability + '</td>' +
@@ -301,6 +305,7 @@
 							'<td><a href="#" class="layui-btn layui-btn-sm updataBtn">修改</a>' +
 							'</td>' +
 							'</tr>';
+						}
 					}
 					$("#prize-list").html(str);
 					form.render();
@@ -317,7 +322,7 @@
 						console.log(data)
 						if(data.code == 0) {
 							$("[name=imgUrl]").val(data.data.imgurl);
-							$(".mainpictrue").attr("src", data.data.imgurl).css("margin-top", "15px");
+							$(".mainpictrue").attr("src", data.data.imgurl).css("margin", "15px 0");
 						} else {
 							return layer.msg('上传失败');
 						}
@@ -380,7 +385,7 @@
 								$(".redpakage").hide();
 								$("[name=isMoney]").val("2");
 								$("[name=imgUrl]").val(prizeInfo.imgUrl);
-								$(".mainpictrue").attr("src", prizeInfo.imgUrl).css("margin-top", "15px");
+								$(".mainpictrue").attr("src", prizeInfo.imgUrl).css("margin", "15px 0");
 								$("[name=name]").val(prizeInfo.name);
 							}
 							form.render();
diff --git a/WebContent/WEB-INF/jsp/pc/report/prize.jsp b/WebContent/WEB-INF/jsp/pc/report/prize.jsp
index a379a01..724386a 100644
--- a/WebContent/WEB-INF/jsp/pc/report/prize.jsp
+++ b/WebContent/WEB-INF/jsp/pc/report/prize.jsp
@@ -31,10 +31,9 @@
 				</div>
 				<div class="layui-input-inline" style="width: 140px;">
 					<select name="status">
-						<option value="">请选择</option>
-						<option value="100">全部</option>
-						<option value="0">未中奖</option>
-						<option value="1">中奖</option>
+						<option value="">状态</option>
+						<option value="1">未兑换</option>
+						<option value="2">已兑换</option>
 					</select>
 				</div>
 				<div class="layui-input-inline" style="width: 140px;">
@@ -54,6 +53,7 @@
 					<th>中奖人员</th>
 					<th>红包</th>
 					<th>礼品</th>
+					<th>状态</th>
 					<th style="min-width: 84px;">时间 </th>
 				</tr>
 			</thead>
@@ -78,7 +78,7 @@
 			var queryObj = {
 				page: 1,
 				pagesize: 10,
-				turn: 0,
+				turn: null,
 				status: null,
 				keyword: null
 			}
@@ -100,8 +100,9 @@
 								'<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>' + data.rows[i].mny + '元</td>' +
-								'<td>' + data.rows[i].name + '</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>'+
 								'<td>' + toTime_G(data.rows[i].createdtime) + '</td>' +
 								'</tr>';
 						}
@@ -136,7 +137,7 @@
 				queryObj.page = 1;
 				queryObj.keyword = $("[name=keyword]").val();
 				queryObj.turn = $("[name=turn]").val();
-				queryObj.status = (queryObj.status == 100 ? "" : queryObj.status)
+				queryObj.status = $("[name=status]").val();
 				initData(queryObj);
 			});
 
@@ -151,7 +152,39 @@
 				form.render();
 				initData(queryObj);
 			})
-
+			
+			//显示红包
+			function showMny(mny){
+				var val = "";
+				if(mny > 0){
+					val = mny + "元";
+				}else{
+					val = "";
+				}
+				return val;
+			}
+			
+			//显示礼品
+			function showPrizeName(mny, name){
+				var val = "";
+				if(mny > 0){
+					val = "";
+				}else{
+					val = name;
+				}
+				return val;
+			}
+			
+			//显示状态
+			function showStatus(s){
+				var val = "";
+				if(s == 1){
+					val = "未兑换";
+				}else if(s == 2){
+					val = "已兑换";
+				}
+				return val;
+			}
 		})
 	</script>