diff --git a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
index 29fe0a6..490175d 100644
--- a/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp
@@ -24,6 +24,15 @@
 			.popupbos .layui-form-label {
 				width: 110px;
 			}
+			
+			.layui-upload-list img {
+				width: auto;
+			}
+			
+			.layui-table img {
+			    max-width: 50px;
+			    height: auto;
+			}
 		</style>
 
 		<body class="wrap">
@@ -173,8 +182,6 @@
 								<input type="number" min="0" name="num" 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;">
 								<input type="number" value="0" name="probability" class="layui-input" />
@@ -203,10 +210,24 @@
 							<div class="layui-form-mid">分</div>
 						</div>
 						<div class="layui-form-item prizeName">
+							<label class="layui-form-label">上传主图 ：</label>
+							<div class="layui-input-inline" style="width: 400px;">
+								<div class="layui-upload">
+									<button type="button" class="layui-btn" id="upload" style="margin:0 20px 0 0;float:left;">上传主图</button>
+									<span class="layui-form-mid layui-word-aux">建议尺寸：100*100</span>
+									<div class="layui-upload-list">
+										<img class="layui-upload-img mainpictrue" src="">
+										<input type="text" style="display:none;" name="imgUrl" lay-verify="required">
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="layui-form-item prizeName">
 							<label class="layui-form-label">礼品名称 ：</label>
 							<div class="layui-input-inline" style="width:235px;">
 								<input type="text" name="name" class="layui-input" />
 							</div>
+							<div class="layui-form-mid layui-word-aux">(礼品名称在6个字以内)</div>
 						</div>
 					</div>
 				</div>
@@ -216,12 +237,12 @@
 		<script src="/zzhnc/res/plugins/layui/layui.js"></script>
 		<script src="/zzhnc/res/js/me.js"></script>
 		<script>
-			layui.use(['form', 'element', 'laydate', 'layer', 'laypage'], function() {
+			layui.use(['form', 'element', 'laydate', 'layer', 'upload'], function() {
 				var form = layui.form,
 					element = layui.element,
 					laydate = layui.laydate,
 					layer = layui.layer,
-					laypage = layui.laypage;
+					upload = layui.upload;
 
 				laydate.render({
 					elem: '[name=beginTime]',
@@ -263,9 +284,8 @@
 					})
 				}
 
-				initData();
-				
-				function prizeList(list){
+				//奖项设置显示
+				function prizeList(list) {
 					var str = "";
 					for(var i = 0; i < list.length; i++) {
 						str += '<tr data-id=' + list[i].id + '>' +
@@ -273,7 +293,7 @@
 							'<td>' + list[i].num + '</td>' +
 							'<td>' + list[i].probability + '</td>' +
 							'<td>' + type(list[i].isMoney) + '</td>' +
-							'<td>' + money(list[i].isMoney, list[i].mixMoney, list[i].maxMoney, list[i].name) + '</td>' +
+							'<td>' + money(list[i].isMoney, list[i].mixMoney, list[i].maxMoney, list[i].imgUrl, list[i].name) + '</td>' +
 							'<td><a href="#" class="layui-btn layui-btn-sm updataBtn">修改</a>' +
 							'</td>' +
 							'</tr>';
@@ -282,6 +302,24 @@
 					form.render();
 				}
 
+				//初始化
+				initData();
+
+				//上传操作
+				upload.render({
+					elem: '#upload',
+					url: '/zzhnc/upload/UploadImg',
+					done: function(data) {
+						console.log(data)
+						if(data.code == 0) {
+							$("[name=imgUrl]").val(data.data.imgurl);
+							$(".mainpictrue").attr("src", data.data.imgurl).css("margin-top", "15px");
+						} else {
+							return layer.msg('上传失败');
+						}
+					}
+				});
+
 				//修改奖品信息
 				$(document).on("click", ".updataBtn", function() {
 					var id = $(this).parents("tr").attr("data-id");
@@ -290,19 +328,20 @@
 					layer.open({
 						type: 1,
 						title: title,
-						area: ["650px", "400px"],
+						area: ["700px", "400px"],
 						content: $(".popupbox"),
 						btnAlign: "c",
 						btn: ["提交", "取消"],
 						scrollbar: false,
 						yes: function(index, layero) {
 							var submitData = prizeInfo;
-							prizeInfo.num = $("[name=num]").val();
-							prizeInfo.probability = $("[name=probability]").val();
-							prizeInfo.isMoney = toBool($("[name=isMoney]").val());
-							prizeInfo.mixMoney = $("[name=mixMoney]").val();
-							prizeInfo.maxMoney = $("[name=maxMoney]").val();
-							prizeInfo.name = $("[name=name]").val();
+							submitData.num = $("[name=num]").val();
+							submitData.probability = $("[name=probability]").val();
+							submitData.isMoney = toBool($("[name=isMoney]").val());
+							submitData.mixMoney = $("[name=mixMoney]").val();
+							submitData.maxMoney = $("[name=maxMoney]").val();
+							submitData.imgUrl = $("[name=imgUrl]").val();
+							submitData.name = $("[name=name]").val();
 							$.ajax({
 								type: 'POST',
 								url: '/zzhnc/activity/editActivityPrize/' + id,
@@ -336,6 +375,8 @@
 								$(".prizeName").show();
 								$(".redpakage").hide();
 								$("[name=isMoney]").val("2");
+								$("[name=imgUrl]").val(prizeInfo.imgUrl);
+								$(".mainpictrue").attr("src", prizeInfo.imgUrl).css("margin-top", "15px");
 								$("[name=name]").val(prizeInfo.name);
 							}
 							form.render();
@@ -440,7 +481,7 @@
 				}
 
 				//渲染列表时，显示的奖品名称
-				function money(type, min, max, name) {
+				function money(type, min, max, img, name) {
 					var text = "";
 					if(type) {
 						if(min != max) {
@@ -449,7 +490,7 @@
 							text = min + " 分 "
 						}
 					} else {
-						text = name;
+						text = '<img class="prizeImg" src="' + img + '" /> ' + name;
 					}
 					return text;
 				}
@@ -462,9 +503,9 @@
 						}
 					}
 				}
-				
+
 				//将单个奖品的数据保存到list中
-				function updatePrizeList(id, info){
+				function updatePrizeList(id, info) {
 					for(var i = 0; i < prizelist.length; i++) {
 						if(prizelist[i].id == id) {
 							prizelist[i] == info;
