fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit ab66c89d6cbba5a3e5eac2fa72c594567dabe63f 2 parents 831a3328 b3af9cc0

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 0 deletions
@@ -20,6 +20,7 @@ e.on("render", function() { @@ -20,6 +20,7 @@ e.on("render", function() {
20 } 20 }
21 if (prizeList) { 21 if (prizeList) {
22 var prizeObj = JSON.parse(prizeList)[0]; 22 var prizeObj = JSON.parse(prizeList)[0];
  23 + $("#prizeId").val(prizeObj.prizeId);
23 $("#prize").val(prizeObj.prize); 24 $("#prize").val(prizeObj.prize);
24 $("#whiteList").val(prizeObj.whiteList); 25 $("#whiteList").val(prizeObj.whiteList);
25 $("#realUserNum").val(prizeObj.realUserNum); 26 $("#realUserNum").val(prizeObj.realUserNum);
@@ -57,6 +58,7 @@ e.on("validate",function() { @@ -57,6 +58,7 @@ e.on("validate",function() {
57 bkStyle.push(!($("#backgroundStyle8").attr("value")) ? "" : $("#backgroundStyle8").attr("value")); 58 bkStyle.push(!($("#backgroundStyle8").attr("value")) ? "" : $("#backgroundStyle8").attr("value"));
58 $("#backgroundStyle").val(bkStyle.join(",")); 59 $("#backgroundStyle").val(bkStyle.join(","));
59 var prizeObj = [{ 60 var prizeObj = [{
  61 + prizeId : $("#prizeId").val(),
60 prize : $("#prize").val(), 62 prize : $("#prize").val(),
61 whiteList : $("#whiteList").val(), 63 whiteList : $("#whiteList").val(),
62 realUserNum : $("#realUserNum").val(), 64 realUserNum : $("#realUserNum").val(),
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
24 <div class="col-md-12"> 24 <div class="col-md-12">
25 <div id="activityForm" role="form" class="form-horizontal form-bordered" method="post" action="{{action}}"> 25 <div id="activityForm" role="form" class="form-horizontal form-bordered" method="post" action="{{action}}">
26 <input type="hidden" id="activityId" value="{{data.activityId}}" /> 26 <input type="hidden" id="activityId" value="{{data.activityId}}" />
  27 + <input type="hidden" id="prizeId" value="{{data.prizeId}}" />
27 <input type="hidden" id="backgroundStyle" value="{{data.backgroundStyle}}" /> 28 <input type="hidden" id="backgroundStyle" value="{{data.backgroundStyle}}" />
28 <input type="hidden" id="prizeList" value="{{data.prizeList}}" /> 29 <input type="hidden" id="prizeList" value="{{data.prizeList}}" />
29 <div class="panel panel-default"> 30 <div class="panel panel-default">