Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop

@@ -20,6 +20,7 @@ e.on("render", function() {
 	}
 	if (prizeList) {
 		var prizeObj = JSON.parse(prizeList)[0];
+		$("#prizeId").val(prizeObj.prizeId);
 		$("#prize").val(prizeObj.prize);
 		$("#whiteList").val(prizeObj.whiteList);
 		$("#realUserNum").val(prizeObj.realUserNum);
@@ -57,6 +58,7 @@ e.on("validate",function() {
 	bkStyle.push(!($("#backgroundStyle8").attr("value")) ? "" : $("#backgroundStyle8").attr("value"));
 	$("#backgroundStyle").val(bkStyle.join(","));
 	var prizeObj = [{
+		prizeId : $("#prizeId").val(),
 		prize : $("#prize").val(),
 		whiteList : $("#whiteList").val(),
 		realUserNum : $("#realUserNum").val(),

@@ -24,6 +24,7 @@
         <div class="col-md-12">
             <div id="activityForm" role="form" class="form-horizontal form-bordered" method="post" action="{{action}}">
 				<input type="hidden" id="activityId" value="{{data.activityId}}" />
+				<input type="hidden" id="prizeId" value="{{data.prizeId}}" />
 				<input type="hidden" id="backgroundStyle" value="{{data.backgroundStyle}}" />
 				<input type="hidden" id="prizeList" value="{{data.prizeList}}" />
                 <div class="panel panel-default">