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({ @@ -40,6 +40,7 @@ var g = new common.grid({
40 }}, 40 }},
41 {display:"频道", name:"yhChannel", render: function (item) { 41 {display:"频道", name:"yhChannel", render: function (item) {
42 if(item.yhChannel) { 42 if(item.yhChannel) {
  43 + item.yhChannel = item.yhChannel.replace(/,/g,"|");
43 return yhChannelArr[item.yhChannel-1]; 44 return yhChannelArr[item.yhChannel-1];
44 } 45 }
45 }}, 46 }},
@@ -125,6 +126,7 @@ var Bll = { @@ -125,6 +126,7 @@ var Bll = {
125 }else if(val == 5) { 126 }else if(val == 5) {
126 option.data.promotionName = $("#promotionName5").val() + "%Off"; 127 option.data.promotionName = $("#promotionName5").val() + "%Off";
127 } 128 }
  129 + option.data.yhChannel = option.data.yhChannel.replace(/\|/g, ",");
128 130
129 option.success=function(res){ 131 option.success=function(res){
130 dialog.close(); 132 dialog.close();
@@ -101,12 +101,12 @@ @@ -101,12 +101,12 @@
101 <div class="form-group"> 101 <div class="form-group">
102 <label class="col-sm-2 control-label">频道</label> 102 <label class="col-sm-2 control-label">频道</label>
103 <div class="col-sm-8"> 103 <div class="col-sm-8">
104 - <label style="cursor: pointer;"><input type="radio" name="yhChannel" value="1">男生</label>  
105 - <label style="cursor: pointer;"><input type="radio" name="yhChannel" value="2">女生</label>  
106 - <label style="cursor: pointer;"><input type="radio" name="yhChannel" value="3">儿童</label>  
107 - <label style="cursor: pointer;"><input type="radio" name="yhChannel" value="4">创意生活</label> 104 + <label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="1">男生</label>
  105 + <label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="2">女生</label>
  106 + <label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="3">儿童</label>
  107 + <label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="4">创意生活</label>
108 </div> 108 </div>
109 - <input type="hidden" id="yhChannel" value="{yhChannel}" for="radio"> 109 + <input type="hidden" id="yhChannel" value="{yhChannel}" for="checkbox">
110 </div> 110 </div>
111 <div class="form-group"> 111 <div class="form-group">
112 <label class="col-sm-2 control-label">促销形式</label> 112 <label class="col-sm-2 control-label">促销形式</label>