fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit d60838f2e702a48300b377670da5ff684f4c80c5 2 parents 7b12a380 d3faa318

Merge branch 'release/release' into release/pre

Inline Side-by-side
Showing 2 changed files with 7 additions and 5 deletions
... ... @@ -40,6 +40,7 @@ var g = new common.grid({
}},
{display:"频道", name:"yhChannel", render: function (item) {
if(item.yhChannel) {
item.yhChannel = item.yhChannel.replace(/,/g,"|");
return yhChannelArr[item.yhChannel-1];
}
}},
... ... @@ -125,6 +126,7 @@ var Bll = {
}else if(val == 5) {
option.data.promotionName = $("#promotionName5").val() + "%Off";
}
option.data.yhChannel = option.data.yhChannel.replace(/\|/g, ",");
option.success=function(res){
dialog.close();
... ...
... ... @@ -101,12 +101,12 @@
<div class="form-group">
<label class="col-sm-2 control-label">频道</label>
<div class="col-sm-8">
<label style="cursor: pointer;"><input type="radio" name="yhChannel" value="1">男生</label>
<label style="cursor: pointer;"><input type="radio" name="yhChannel" value="2">女生</label>
<label style="cursor: pointer;"><input type="radio" name="yhChannel" value="3">儿童</label>
<label style="cursor: pointer;"><input type="radio" name="yhChannel" value="4">创意生活</label>
<label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="1">男生</label>
<label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="2">女生</label>
<label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="3">儿童</label>
<label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="4">创意生活</label>
</div>
<input type="hidden" id="yhChannel" value="{yhChannel}" for="radio">
<input type="hidden" id="yhChannel" value="{yhChannel}" for="checkbox">
</div>
<div class="form-group">
<label class="col-sm-2 control-label">促销形式</label>
... ...