fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by wangshusheng
Commit 1f606fdeedbbf0b71adc89dc4d6fda80bc88f70a 2 parents 20e14527 61b6a7d3

Merge branch 'gray'

Inline Side-by-side
Showing 9 changed files with 58 additions and 2 deletions
... ... @@ -65,7 +65,8 @@ module.exports = {
cusPublicCouponName: {type: String},
publicCouponType: {type: Number},
channel: {type: String},
showScope : {type: String}
showScope : {type: String},
checkRequired: {type: Number},
}
},
reject: {
... ...
... ... @@ -187,6 +187,18 @@
placeholder="优惠券使用条件简介" style="resize: none">[[explains]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">领取弹框确认</label>
<div class="col-sm-8">
<select id="checkRequired" tabindex="-1" class="select2-offscreen brandBtn-group observe"
value="[[checkRequired]]" data-field="checkRequired" required >
<option value="0">不需要</option>
<option value="1">需要</option>
</select>
</div>
</div>
</div>
</div>
... ...
... ... @@ -98,6 +98,8 @@ var Bll = {
new common.dropDown({el: '#filter-couponType'});
new common.dropDown({el: '#checkRequired'});
common.util.__ajax({
url: "/coupon/getAllDepartment",//获取所有部门
data: {size: 1000}
... ... @@ -347,6 +349,15 @@ $(document).on("change", "#useRange", function () {
Bll.__render(couponBean, type);
});
$(document).on("change", "#checkRequired", function () {
var couponTypeVal = $(this).val();
couponBean.checkRequired = $(this).val();
$.extend(window.ViewModel, couponBean);
Bll.__render(couponBean, type);
});
$(document).on("change", "#filter-couponType", function () {
var couponTypeVal = $(this).val();
couponBean.couponType = $(this).val();
... ...
... ... @@ -15,6 +15,9 @@ var artTemplate = common.artTemplate;
//下拉框
new common.dropDown({el: '#filter-couponType'});
new common.dropDown({el: '#checkRequired'});
//下拉框
new common.dropDown({el: '#filter-feeSharingType'});
... ...
... ... @@ -26,6 +26,7 @@ var couponBean = {
shopList: "",
shopIds: "",
tPlusN:"",
checkRequired:0,
feeSharingType: "0",
feeSharingRatio: "",
isUseLimitRule: "",
... ...
... ... @@ -103,6 +103,8 @@ webpackJsonp([75],{
new common.dropDown({el: '#filter-couponType'});
new common.dropDown({el: '#checkRequired'});
common.util.__ajax({
url: "/coupon/getAllDepartment",//获取所有部门
data: {size: 1000}
... ... @@ -352,6 +354,15 @@ webpackJsonp([75],{
Bll.__render(couponBean, type);
});
$(document).on("change", "#checkRequired", function () {
var couponTypeVal = $(this).val();
couponBean.checkRequired = $(this).val();
$.extend(window.ViewModel, couponBean);
Bll.__render(couponBean, type);
});
$(document).on("change", "#filter-couponType", function () {
var couponTypeVal = $(this).val();
couponBean.couponType = $(this).val();
... ... @@ -1161,6 +1172,7 @@ webpackJsonp([75],{
shopList: "",
shopIds: "",
tPlusN:"",
checkRequired:0,
feeSharingType: "0",
feeSharingRatio: "",
isUseLimitRule: "",
... ...
... ... @@ -19,6 +19,9 @@ webpackJsonp([77],[
//下拉框
new common.dropDown({el: '#filter-couponType'});
new common.dropDown({el: '#checkRequired'});
//下拉框
new common.dropDown({el: '#filter-feeSharingType'});
... ...
... ... @@ -65,7 +65,8 @@ module.exports = {
cusPublicCouponName: {type: String},
publicCouponType: {type: Number},
channel: {type: String},
showScope : {type: String}
showScope : {type: String},
checkRequired: {type: Number},
}
},
reject: {
... ...
... ... @@ -187,6 +187,18 @@
placeholder="优惠券使用条件简介" style="resize: none">[[explains]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">领取弹框确认</label>
<div class="col-sm-8">
<select id="checkRequired" tabindex="-1" class="select2-offscreen brandBtn-group observe"
value="[[checkRequired]]" data-field="checkRequired" required >
<option value="0">不需要</option>
<option value="1">需要</option>
</select>
</div>
</div>
</div>
</div>
... ...