Merge branch 'gray'
Showing
9 changed files
with
58 additions
and
2 deletions
| @@ -65,7 +65,8 @@ module.exports = { | @@ -65,7 +65,8 @@ module.exports = { | ||
| 65 | cusPublicCouponName: {type: String}, | 65 | cusPublicCouponName: {type: String}, |
| 66 | publicCouponType: {type: Number}, | 66 | publicCouponType: {type: Number}, |
| 67 | channel: {type: String}, | 67 | channel: {type: String}, |
| 68 | - showScope : {type: String} | 68 | + showScope : {type: String}, |
| 69 | + checkRequired: {type: Number}, | ||
| 69 | } | 70 | } |
| 70 | }, | 71 | }, |
| 71 | reject: { | 72 | reject: { |
| @@ -187,6 +187,18 @@ | @@ -187,6 +187,18 @@ | ||
| 187 | placeholder="优惠券使用条件简介" style="resize: none">[[explains]]</textarea> | 187 | placeholder="优惠券使用条件简介" style="resize: none">[[explains]]</textarea> |
| 188 | </div> | 188 | </div> |
| 189 | </div> | 189 | </div> |
| 190 | + | ||
| 191 | + <div class="form-group"> | ||
| 192 | + <label class="col-sm-2 control-label">领取弹框确认</label> | ||
| 193 | + | ||
| 194 | + <div class="col-sm-8"> | ||
| 195 | + <select id="checkRequired" tabindex="-1" class="select2-offscreen brandBtn-group observe" | ||
| 196 | + value="[[checkRequired]]" data-field="checkRequired" required > | ||
| 197 | + <option value="0">不需要</option> | ||
| 198 | + <option value="1">需要</option> | ||
| 199 | + </select> | ||
| 200 | + </div> | ||
| 201 | + </div> | ||
| 190 | </div> | 202 | </div> |
| 191 | </div> | 203 | </div> |
| 192 | 204 |
| @@ -98,6 +98,8 @@ var Bll = { | @@ -98,6 +98,8 @@ var Bll = { | ||
| 98 | 98 | ||
| 99 | new common.dropDown({el: '#filter-couponType'}); | 99 | new common.dropDown({el: '#filter-couponType'}); |
| 100 | 100 | ||
| 101 | + new common.dropDown({el: '#checkRequired'}); | ||
| 102 | + | ||
| 101 | common.util.__ajax({ | 103 | common.util.__ajax({ |
| 102 | url: "/coupon/getAllDepartment",//获取所有部门 | 104 | url: "/coupon/getAllDepartment",//获取所有部门 |
| 103 | data: {size: 1000} | 105 | data: {size: 1000} |
| @@ -347,6 +349,15 @@ $(document).on("change", "#useRange", function () { | @@ -347,6 +349,15 @@ $(document).on("change", "#useRange", function () { | ||
| 347 | Bll.__render(couponBean, type); | 349 | Bll.__render(couponBean, type); |
| 348 | }); | 350 | }); |
| 349 | 351 | ||
| 352 | + | ||
| 353 | +$(document).on("change", "#checkRequired", function () { | ||
| 354 | + var couponTypeVal = $(this).val(); | ||
| 355 | + couponBean.checkRequired = $(this).val(); | ||
| 356 | + | ||
| 357 | + $.extend(window.ViewModel, couponBean); | ||
| 358 | + Bll.__render(couponBean, type); | ||
| 359 | +}); | ||
| 360 | + | ||
| 350 | $(document).on("change", "#filter-couponType", function () { | 361 | $(document).on("change", "#filter-couponType", function () { |
| 351 | var couponTypeVal = $(this).val(); | 362 | var couponTypeVal = $(this).val(); |
| 352 | couponBean.couponType = $(this).val(); | 363 | couponBean.couponType = $(this).val(); |
| @@ -15,6 +15,9 @@ var artTemplate = common.artTemplate; | @@ -15,6 +15,9 @@ var artTemplate = common.artTemplate; | ||
| 15 | //下拉框 | 15 | //下拉框 |
| 16 | new common.dropDown({el: '#filter-couponType'}); | 16 | new common.dropDown({el: '#filter-couponType'}); |
| 17 | 17 | ||
| 18 | + | ||
| 19 | +new common.dropDown({el: '#checkRequired'}); | ||
| 20 | + | ||
| 18 | //下拉框 | 21 | //下拉框 |
| 19 | new common.dropDown({el: '#filter-feeSharingType'}); | 22 | new common.dropDown({el: '#filter-feeSharingType'}); |
| 20 | 23 |
| @@ -26,6 +26,7 @@ var couponBean = { | @@ -26,6 +26,7 @@ var couponBean = { | ||
| 26 | shopList: "", | 26 | shopList: "", |
| 27 | shopIds: "", | 27 | shopIds: "", |
| 28 | tPlusN:"", | 28 | tPlusN:"", |
| 29 | + checkRequired:0, | ||
| 29 | feeSharingType: "0", | 30 | feeSharingType: "0", |
| 30 | feeSharingRatio: "", | 31 | feeSharingRatio: "", |
| 31 | isUseLimitRule: "", | 32 | isUseLimitRule: "", |
| @@ -103,6 +103,8 @@ webpackJsonp([75],{ | @@ -103,6 +103,8 @@ webpackJsonp([75],{ | ||
| 103 | 103 | ||
| 104 | new common.dropDown({el: '#filter-couponType'}); | 104 | new common.dropDown({el: '#filter-couponType'}); |
| 105 | 105 | ||
| 106 | + new common.dropDown({el: '#checkRequired'}); | ||
| 107 | + | ||
| 106 | common.util.__ajax({ | 108 | common.util.__ajax({ |
| 107 | url: "/coupon/getAllDepartment",//获取所有部门 | 109 | url: "/coupon/getAllDepartment",//获取所有部门 |
| 108 | data: {size: 1000} | 110 | data: {size: 1000} |
| @@ -352,6 +354,15 @@ webpackJsonp([75],{ | @@ -352,6 +354,15 @@ webpackJsonp([75],{ | ||
| 352 | Bll.__render(couponBean, type); | 354 | Bll.__render(couponBean, type); |
| 353 | }); | 355 | }); |
| 354 | 356 | ||
| 357 | + | ||
| 358 | + $(document).on("change", "#checkRequired", function () { | ||
| 359 | + var couponTypeVal = $(this).val(); | ||
| 360 | + couponBean.checkRequired = $(this).val(); | ||
| 361 | + | ||
| 362 | + $.extend(window.ViewModel, couponBean); | ||
| 363 | + Bll.__render(couponBean, type); | ||
| 364 | + }); | ||
| 365 | + | ||
| 355 | $(document).on("change", "#filter-couponType", function () { | 366 | $(document).on("change", "#filter-couponType", function () { |
| 356 | var couponTypeVal = $(this).val(); | 367 | var couponTypeVal = $(this).val(); |
| 357 | couponBean.couponType = $(this).val(); | 368 | couponBean.couponType = $(this).val(); |
| @@ -1161,6 +1172,7 @@ webpackJsonp([75],{ | @@ -1161,6 +1172,7 @@ webpackJsonp([75],{ | ||
| 1161 | shopList: "", | 1172 | shopList: "", |
| 1162 | shopIds: "", | 1173 | shopIds: "", |
| 1163 | tPlusN:"", | 1174 | tPlusN:"", |
| 1175 | + checkRequired:0, | ||
| 1164 | feeSharingType: "0", | 1176 | feeSharingType: "0", |
| 1165 | feeSharingRatio: "", | 1177 | feeSharingRatio: "", |
| 1166 | isUseLimitRule: "", | 1178 | isUseLimitRule: "", |
| @@ -19,6 +19,9 @@ webpackJsonp([77],[ | @@ -19,6 +19,9 @@ webpackJsonp([77],[ | ||
| 19 | //下拉框 | 19 | //下拉框 |
| 20 | new common.dropDown({el: '#filter-couponType'}); | 20 | new common.dropDown({el: '#filter-couponType'}); |
| 21 | 21 | ||
| 22 | + | ||
| 23 | + new common.dropDown({el: '#checkRequired'}); | ||
| 24 | + | ||
| 22 | //下拉框 | 25 | //下拉框 |
| 23 | new common.dropDown({el: '#filter-feeSharingType'}); | 26 | new common.dropDown({el: '#filter-feeSharingType'}); |
| 24 | 27 |
| @@ -65,7 +65,8 @@ module.exports = { | @@ -65,7 +65,8 @@ module.exports = { | ||
| 65 | cusPublicCouponName: {type: String}, | 65 | cusPublicCouponName: {type: String}, |
| 66 | publicCouponType: {type: Number}, | 66 | publicCouponType: {type: Number}, |
| 67 | channel: {type: String}, | 67 | channel: {type: String}, |
| 68 | - showScope : {type: String} | 68 | + showScope : {type: String}, |
| 69 | + checkRequired: {type: Number}, | ||
| 69 | } | 70 | } |
| 70 | }, | 71 | }, |
| 71 | reject: { | 72 | reject: { |
| @@ -187,6 +187,18 @@ | @@ -187,6 +187,18 @@ | ||
| 187 | placeholder="优惠券使用条件简介" style="resize: none">[[explains]]</textarea> | 187 | placeholder="优惠券使用条件简介" style="resize: none">[[explains]]</textarea> |
| 188 | </div> | 188 | </div> |
| 189 | </div> | 189 | </div> |
| 190 | + | ||
| 191 | + <div class="form-group"> | ||
| 192 | + <label class="col-sm-2 control-label">领取弹框确认</label> | ||
| 193 | + | ||
| 194 | + <div class="col-sm-8"> | ||
| 195 | + <select id="checkRequired" tabindex="-1" class="select2-offscreen brandBtn-group observe" | ||
| 196 | + value="[[checkRequired]]" data-field="checkRequired" required > | ||
| 197 | + <option value="0">不需要</option> | ||
| 198 | + <option value="1">需要</option> | ||
| 199 | + </select> | ||
| 200 | + </div> | ||
| 201 | + </div> | ||
| 190 | </div> | 202 | </div> |
| 191 | </div> | 203 | </div> |
| 192 | 204 |
-
Please register or login to post a comment