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 @@
<div class="form-group">
<label class="col-sm-2 control-label">发源地 <span class="red">*</span></label>
<div class="col-sm-10">
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="1"/>欧洲
</label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="2"/>日本 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="3"/>韩国 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="4"/>香港 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="5"/>本地 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="6"/>澳洲 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="7"/>台湾 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="8"/>美国 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="9"/>泰国 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="10"/>新加坡 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="11"/>东南亚 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="12"/>加拿大 </label>
<div class ="countryInfo">
</div>
</div>
<input type="hidden" id="brandHeadstream" value="<%data.brandHeadstream%>" required for="radio">
</div>
... ... @@ -182,7 +159,17 @@
</div>
</div>
</div>
<script type="text/template" id="countryInfoList">
[[each data as item _index]]
<label class="radio-inline">
[[if item.id == brandHeadstream]]
<input checked="checked" type="radio" name="brandHeadstream" value=[[item.id]]>[[item.countryChName]]
[[else]]
<input type="radio" name="brandHeadstream" value=[[item.id]]>[[item.countryChName]]
[[/if]]
</label>
[[/each]]
</script>
<!--图片列表-->
<script type="text/template" id="template2">
<ul class="cover-image-list col-sm-10" id="addPic" style="padding: 0;margin: 0;">
... ...
... ... @@ -14,7 +14,7 @@
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、第一行标题栏：<span style="color: #67D267;">SKN，展示平台</span><br>
2、第一行标题栏：<span style="color: #67D267;">SKN，展示平台(枚举值为：&nbsp; BLK&nbsp;&nbsp;或者&nbsp;&nbsp;YOHO&nbsp;)</span><br>
3、<a href="/ajax/link/batchModifyAppType">下载样例</a>
</td>
</tr>
... ...
... ... @@ -93,12 +93,16 @@ $(document).on('click', '.download-btn', function() {
location.href = '/ajax/download?path=' + path;
});
$(function(){
$(".countryInfo").empty().html(common.util.__template2($("#countryInfoList").html(), {data: mainData.countryInfoList, brandHeadstream:mainData.brandHeadstream}));
});
$(document).on('click','#save_brand',function () {
e.submit($("#basicForm").attr("action"), function (option) {
//option.data.authorizeCerts = authorizeCertList;
option.data.countryId = option.data.brandHeadstream;
var brandHeadstream = $("input[name='brandHeadstream']:checked").val();
option.data.countryId = brandHeadstream;
option.data.brandHeadstream = brandHeadstream;
option.data.authorizeCerts = JSON.stringify(authorizeCertList);
option.success = function (res) {
... ...
... ... @@ -14,7 +14,7 @@
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、第一行标题栏：<span style="color: #67D267;">SKN，展示平台</span><br>
2、第一行标题栏：<span style="color: #67D267;">SKN，展示平台(枚举值为：&nbsp; BLK&nbsp;&nbsp;或者&nbsp;&nbsp;YOHO&nbsp;)</span><br>
3、<a href="/ajax/link/batchModifyAppType">下载样例</a>
</td>
</tr>
... ...