Authored by caoyan

Merge branch 'dev_限定排队' into test6.5.5

... ... @@ -56,7 +56,8 @@ module.exports= {
{name: 'activityDesc',type: 'string'},
{name: 'prizeList',type: 'string'},
{name: 'numberLimit',type: 'number'},
{name: 'isShare',type: 'number'}
{name: 'isShare',type: 'number'},
{name: 'platformType',type: 'number'}
]
},
... ... @@ -74,7 +75,8 @@ module.exports= {
{name: 'prizeList',type: 'string'},
{name: 'status',type: 'Number'},
{name: 'numberLimit',type: 'number'},
{name: 'isShare',type: 'number'}
{name: 'isShare',type: 'number'},
{name: 'platformType',type: 'number'}
]
},
... ...
... ... @@ -51,6 +51,15 @@
<input type="hidden" id="isShare" value="<%data.isShare%>">
</div>
</div>
<div class="form-group">
<label class="col-sm-2"></label>
<div class="input-group col-sm-6" style="padding-left: 10px;">
<span>线下店使用</span>
<input type="checkbox" id="platform_type"<%if data.platformType == 1%>checked<%/if%> placeholder="线下店使用">
<input type="hidden" id="platformType" value="<%data.platformType%>">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">奖品类型:<span class="red">*</span></label>
... ...
... ... @@ -66,6 +66,11 @@ e.on("validate", function () {
}else{
$("#isShare").val(0);
}
if($('#platform_type').is(':checked')){
$("#platformType").val(1);
}else{
$("#platformType").val(0);
}
var prizeObj = [{
prizeId: $("#prizeId").val(),
prizeType: $("#prizeType").val(),
... ...