Authored by mali

Merge branch 'master' into gray

... ... @@ -37,7 +37,7 @@
</div>
<div class="form-group">
<label class="col-sm-2"></label>
<div class="input-group col-sm-6" style="padding-left: 10px;">
<div class="input-group col-sm-6" style="padding-left: 10px;z-index: 1;">
<span class="input-group-addon">人数上限</span>
<input type="text" id="numberLimit" class="form-control number" value="<%data.numberLimit%>" placeholder="人数上限">
</div>
... ... @@ -63,7 +63,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">奖品设置:<span class="red">*</span></label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group" style="z-index: 1;">
<span class="input-group-addon">限购码批次号<span class="red">*</span></span>
<input type="text" form="activityForm" name="prize" id="prize" class="form-control" value="<%data.prize%>" placeholder="限购码批次号" required>
</div>
... ...
... ... @@ -37,7 +37,7 @@
</div>
<div class="form-group">
<label class="col-sm-2"></label>
<div class="input-group col-sm-6" style="padding-left: 10px;">
<div class="input-group col-sm-6" style="padding-left: 10px;z-index: 1;">
<span class="input-group-addon">人数上限</span>
<input type="text" id="numberLimit" class="form-control number" value="<%data.numberLimit%>" placeholder="人数上限">
</div>
... ... @@ -63,7 +63,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">奖品设置:<span class="red">*</span></label>
<div class="col-sm-6">
<div class="input-group">
<div class="input-group" style="z-index: 1;">
<span class="input-group-addon">限购码批次号<span class="red">*</span></span>
<input type="text" form="activityForm" name="prize" id="prize" class="form-control" value="<%data.prize%>" placeholder="限购码批次号" required>
</div>
... ...