fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by mali
Commit e417e1f15e5b3549cbd8226c91edf2cb13dcf72e 2 parents e6b36de7 6fb542a2

Merge branch 'master' into dev_店铺bug

Inline Side-by-side
Showing 4 changed files with 21 additions and 30 deletions
@@ -90,31 +90,8 @@ @@ -90,31 +90,8 @@
90 <div class="form-group"> 90 <div class="form-group">
91 <label class="col-sm-2 control-label">发源地 <span class="red">*</span></label> 91 <label class="col-sm-2 control-label">发源地 <span class="red">*</span></label>
92 <div class="col-sm-10"> 92 <div class="col-sm-10">
93 - <label class="radio-inline">  
94 - <input type="radio" name="brandHeadstream" value="1"/>欧洲  
95 - </label>  
96 - <label class="radio-inline">  
97 - <input type="radio" name="brandHeadstream" value="2"/>日本 </label>  
98 - <label class="radio-inline">  
99 - <input type="radio" name="brandHeadstream" value="3"/>韩国 </label>  
100 - <label class="radio-inline">  
101 - <input type="radio" name="brandHeadstream" value="4"/>香港 </label>  
102 - <label class="radio-inline">  
103 - <input type="radio" name="brandHeadstream" value="5"/>本地 </label>  
104 - <label class="radio-inline">  
105 - <input type="radio" name="brandHeadstream" value="6"/>澳洲 </label>  
106 - <label class="radio-inline">  
107 - <input type="radio" name="brandHeadstream" value="7"/>台湾 </label>  
108 - <label class="radio-inline">  
109 - <input type="radio" name="brandHeadstream" value="8"/>美国 </label>  
110 - <label class="radio-inline">  
111 - <input type="radio" name="brandHeadstream" value="9"/>泰国 </label>  
112 - <label class="radio-inline">  
113 - <input type="radio" name="brandHeadstream" value="10"/>新加坡 </label>  
114 - <label class="radio-inline">  
115 - <input type="radio" name="brandHeadstream" value="11"/>东南亚 </label>  
116 - <label class="radio-inline">  
117 - <input type="radio" name="brandHeadstream" value="12"/>加拿大 </label> 93 + <div class ="countryInfo">
  94 + </div>
118 </div> 95 </div>
119 <input type="hidden" id="brandHeadstream" value="<%data.brandHeadstream%>" required for="radio"> 96 <input type="hidden" id="brandHeadstream" value="<%data.brandHeadstream%>" required for="radio">
120 </div> 97 </div>
@@ -182,7 +159,17 @@ @@ -182,7 +159,17 @@
182 </div> 159 </div>
183 </div> 160 </div>
184 </div> 161 </div>
185 - 162 +<script type="text/template" id="countryInfoList">
  163 + [[each data as item _index]]
  164 + <label class="radio-inline">
  165 + [[if item.id == brandHeadstream]]
  166 + <input checked="checked" type="radio" name="brandHeadstream" value=[[item.id]]>[[item.countryChName]]
  167 + [[else]]
  168 + <input type="radio" name="brandHeadstream" value=[[item.id]]>[[item.countryChName]]
  169 + [[/if]]
  170 + </label>
  171 + [[/each]]
  172 +</script>
186 <!--图片列表--> 173 <!--图片列表-->
187 <script type="text/template" id="template2"> 174 <script type="text/template" id="template2">
188 <ul class="cover-image-list col-sm-10" id="addPic" style="padding: 0;margin: 0;"> 175 <ul class="cover-image-list col-sm-10" id="addPic" style="padding: 0;margin: 0;">
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <td>说明：</td> 14 <td>说明：</td>
15 <td colspan="2"> 15 <td colspan="2">
16 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br> 16 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
17 - 2、第一行标题栏：<span style="color: #67D267;">SKN，展示平台</span><br> 17 + 2、第一行标题栏：<span style="color: #67D267;">SKN，展示平台(枚举值为：&nbsp; BLK&nbsp;&nbsp;或者&nbsp;&nbsp;YOHO&nbsp;)</span><br>
18 3、<a href="/ajax/link/batchModifyAppType">下载样例</a> 18 3、<a href="/ajax/link/batchModifyAppType">下载样例</a>
19 </td> 19 </td>
20 </tr> 20 </tr>
@@ -93,12 +93,16 @@ $(document).on('click', '.download-btn', function() { @@ -93,12 +93,16 @@ $(document).on('click', '.download-btn', function() {
93 location.href = '/ajax/download?path=' + path; 93 location.href = '/ajax/download?path=' + path;
94 }); 94 });
95 95
96 - 96 +$(function(){
  97 + $(".countryInfo").empty().html(common.util.__template2($("#countryInfoList").html(), {data: mainData.countryInfoList, brandHeadstream:mainData.brandHeadstream}));
  98 +});
97 99
98 $(document).on('click','#save_brand',function () { 100 $(document).on('click','#save_brand',function () {
99 e.submit($("#basicForm").attr("action"), function (option) { 101 e.submit($("#basicForm").attr("action"), function (option) {
100 //option.data.authorizeCerts = authorizeCertList; 102 //option.data.authorizeCerts = authorizeCertList;
101 - option.data.countryId = option.data.brandHeadstream; 103 + var brandHeadstream = $("input[name='brandHeadstream']:checked").val();
  104 + option.data.countryId = brandHeadstream;
  105 + option.data.brandHeadstream = brandHeadstream;
102 option.data.authorizeCerts = JSON.stringify(authorizeCertList); 106 option.data.authorizeCerts = JSON.stringify(authorizeCertList);
103 107
104 option.success = function (res) { 108 option.success = function (res) {
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <td>说明：</td> 14 <td>说明：</td>
15 <td colspan="2"> 15 <td colspan="2">
16 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br> 16 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
17 - 2、第一行标题栏：<span style="color: #67D267;">SKN，展示平台</span><br> 17 + 2、第一行标题栏：<span style="color: #67D267;">SKN，展示平台(枚举值为：&nbsp; BLK&nbsp;&nbsp;或者&nbsp;&nbsp;YOHO&nbsp;)</span><br>
18 3、<a href="/ajax/link/batchModifyAppType">下载样例</a> 18 3、<a href="/ajax/link/batchModifyAppType">下载样例</a>
19 </td> 19 </td>
20 </tr> 20 </tr>