fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by wangwei
Commit 28b8d461d41f66900714f6dfae9c2f99f6cc5e9c 1 parent 8f21859f

fix bug

Inline Side-by-side
Showing 2 changed files with 12 additions and 7 deletions
... ... @@ -258,16 +258,16 @@
<label class="col-sm-2 control-label"></label>
<div class="col-sm-10">
<label class="radio-inline">
<input type="radio" name="feeSharingType" value="1" [[if couponType==1||couponType==3||couponType==4||couponType==5||couponType==7]]checked [[else if couponType==6]]disabled[[/if]]>我司承担</label>
<input type="radio" name="feeSharingType" value="1" [[if couponType==1||couponType==3||couponType==4||couponType==5||couponType==7]]checked [[else if couponType==6]]disabled[[/if]] [[if status==1]]disabled[[/if]]>我司承担</label>
<label class="radio-inline">
<input type="radio" name="feeSharingType" value="2" [[if couponType==4||couponType==5||couponType==7]]disabled[[else if couponType==6]]checked[[/if]]>供应商承担</label>
<input type="radio" name="feeSharingType" value="2" [[if couponType==4||couponType==5||couponType==7||status==1]]disabled[[else if couponType==6]]checked[[/if]]>供应商承担</label>
<label class="radio-inline">
<input type="radio" name="feeSharingType" value="3" [[if couponType==4||couponType==5||couponType==6||couponType==7]] disabled [[/if]]>分摊(合同结算)</label>
<input type="radio" name="feeSharingType" value="3" [[if couponType==4||couponType==5||couponType==6||couponType==7||status==1]] disabled [[/if]]>分摊(合同结算)</label>
<label class="radio-inline">
<input type="radio" name="feeSharingType" value="4" [[if couponType==4||couponType==5||couponType==6||couponType==7]] disabled [[/if]]>分摊-我司承担比例&nbsp;&nbsp;</label>
<input type="radio" name="feeSharingType" value="4" [[if couponType==4||couponType==5||couponType==6||couponType==7||status==1]] disabled [[/if]]>分摊-我司承担比例&nbsp;&nbsp;</label>
<input type="hidden" value="[[feeSharingType]]" id="feeSharingType" for="radio"
placeholder="费用分摊">
<select id="feeSharingRatio" name="feeSharingRatio" value="[[feeSharingRatio]]" data-field="feeSharingRatio" class="select-inline" [[if couponType==4||couponType==5||couponType==6||couponType==7]] disabled [[/if]]>
<select id="feeSharingRatio" name="feeSharingRatio" value="[[feeSharingRatio]]" data-field="feeSharingRatio" class="select-inline" [[if couponType==4||couponType==5||couponType==6||couponType==7||status==1]] disabled [[/if]]>
<option value="0.1" selected="selected">0.1</option>
<option value="0.2">0.2</option>
<option value="0.3">0.3</option>
... ...
... ... @@ -191,7 +191,7 @@ var Bll = {
/**
* 根据type判断界面
*/
console.log(type);
console.log("type====="+type);
if (type == 'add') {
Bll.__render(couponBean, type);
} else {
... ... @@ -306,8 +306,13 @@ $(document).on("keyup", ".number", function () {
* 保存
*/
$(document).on("click", "#save_brand", function () {
//新增时如果，如果没有选定，赋予1(我司承担)
if(type=='add'&&$("#feeSharingType").val()=='0'){
couponBean.feeSharingType = 1;
}else{
couponBean.feeSharingType = $("#feeSharingType").val();
}
couponBean.feeSharingRatio = $("#feeSharingRatio").val();
couponBean.feeSharingType = $("#feeSharingType").val();
if(couponBean.couponType=='6'){
if(couponBean.shopList==''){
common.util.__tip('店铺券需要设置店铺限制!', 'warning');
... ...