fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by mali
Commit 3901b0b7d1781f8c04b79c90e8c816d55fc28264 2 parents 701c1450 c3ba7a74

Merge branch 'gray' into test6.5.4

Inline Side-by-side
Showing 8 changed files with 27 additions and 11 deletions
... ... @@ -327,7 +327,7 @@
<div class="col-sm-10">
<label class="radio-inline">
[[if couponType==8]]
<input type="radio" id="feeSharingType" value="5" checked>会员营销</label>
<input type="radio" id="feeSharingType" value="5" checked>优惠券分摊条款</label>
[[else]]
[[if status==1&&feeSharingType==0]]
<input type="radio" name="feeSharingType" value="1" disabled>我司承担</label>
... ...
... ... @@ -35,7 +35,7 @@
<option value="2">供应商承担</option>
<option value="3">分摊(合同结算)</option>
<option value="4">分摊-我司承担比例</option>
<option value="5">会员营销</option>
<option value="5">优惠券分摊条款</option>
</select>
</div>
<div class="panel-col">
... ... @@ -300,7 +300,7 @@
[[else if feeSharingType == 4]]
<p>分摊-我司承担比例:[[feeSharingRatio]]</p>
[[else if feeSharingType == 5]]
<p>会员营销</p>
<p>优惠券分摊条款</p>
[[/if]]
</div>
</div>
... ...
... ... @@ -155,7 +155,7 @@ var g = new common.grid({
}else if(item.feeSharingType ==4){
feeType = "分摊-我司承担比例:"+item.feeSharingRatio;
}else if(item.feeSharingType ==5){
feeType = "会员营销";
feeType = "优惠券分摊条款";
}
return feeType;
}},
... ...
... ... @@ -488,7 +488,7 @@ webpackJsonp([33],[
var _index=$(this).data("index");
var _eq=$(this).data("eq");
var item=g.__rows[_index].goodsSizeList[_eq];
item.nationalCode=$(this).val();
item.nationalCode=$.trim($(this).val());
});
// $(document).on("change",":checkbox[name=ageLevel]",function(){
// var value=$(this).val();
... ... @@ -614,7 +614,7 @@ webpackJsonp([33],[
if(g.__rows.length>0) {
$.each(g.__rows,function(index,item){
$.each(item.goodsSizeList,function(index1,item1){
nationalCodeMap.push({'productSku' : item1.productSku, 'nationalCode' : item1.nationalCode});
nationalCodeMap.push({'productSku' : item1.productSku, 'nationalCode' : $.trim(item1.nationalCode)});
});
});
}
... ...
... ... @@ -427,6 +427,13 @@ webpackJsonp([74],{
}
}
var productLimit = $("textarea[name=\"productLimit\"]").val();
var explains = couponBean.explains;
if(explains==''){
common.util.__tip('优惠券说明不能为空!', 'warning');
return false;
}
if(productLimit){
couponBean.productLimit = productLimit;
if(productLimit.indexOf("，")>-1){
... ... @@ -927,7 +934,7 @@ webpackJsonp([74],{
department:"",
startTime:"",
endTime:"",
explains:"",
explains:"特例商品不支持使用优惠券",
useLimitType:0,
useLimit:"",
couponAmount:"",
... ...
... ... @@ -158,6 +158,8 @@ webpackJsonp([76],[
feeType = "分摊(合同结算)";
}else if(item.feeSharingType ==4){
feeType = "分摊-我司承担比例:"+item.feeSharingRatio;
}else if(item.feeSharingType ==5){
feeType = "优惠券分摊条款";
}
return feeType;
}},
... ...
... ... @@ -38,7 +38,7 @@
</div>
</script>
<script type="text/template" id="couponListAdd-template">
<div class="panel panel-default">
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="form-group">
... ... @@ -165,7 +165,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">优惠券说明</label>
<label class="col-sm-2 control-label">优惠券说明<span class="red">*</span></label>
<div class="col-sm-8">
<textarea class="form-control observe" prompt="优惠券说明" data-field="explains" maxlength="100"
... ... @@ -326,6 +326,9 @@
<label class="col-sm-2 control-label"></label>
<div class="col-sm-10">
<label class="radio-inline">
[[if couponType==8]]
<input type="radio" id="feeSharingType" value="5" checked>优惠券分摊条款</label>
[[else]]
[[if status==1&&feeSharingType==0]]
<input type="radio" name="feeSharingType" value="1" disabled>我司承担</label>
[[else]]
... ... @@ -350,6 +353,7 @@
<option value="0.8">0.8</option>
<option value="0.9">0.9</option>
</select>
[[/if]]
</div>
</div>
</div>
... ... @@ -469,7 +473,7 @@
</div>
<div class="col-sm-2 height40">
<a class="btn btn-danger btn-xs del-shop-btn" href="javascript:;">-</a>
<a class="btn btn-info btn-xs add-shop-btn" href="javascript:;">+</a>
<!--<a class="btn btn-info btn-xs add-shop-btn" href="javascript:;">+</a>-->
</div>
</div>
</div>
... ... @@ -489,7 +493,7 @@
</div>
<div class="col-sm-2 height40">
<a class="btn btn-danger btn-xs del-shop-btn" href="javascript:;">-</a>
<a class="btn btn-info btn-xs add-shop-btn" href="javascript:;">+</a>
<!--<a class="btn btn-info btn-xs add-shop-btn" href="javascript:;">+</a>-->
</div>
</div>
</script>
... ...
... ... @@ -35,6 +35,7 @@
<option value="2">供应商承担</option>
<option value="3">分摊(合同结算)</option>
<option value="4">分摊-我司承担比例</option>
<option value="5">优惠券分摊条款</option>
</select>
</div>
<div class="panel-col">
... ... @@ -298,6 +299,8 @@
<p>分摊(合同结算)</p>
[[else if feeSharingType == 4]]
<p>分摊-我司承担比例:[[feeSharingRatio]]</p>
[[else if feeSharingType == 5]]
<p>优惠券分摊条款</p>
[[/if]]
</div>
</div>
... ...