Merge branch 'feature/coupon' into develop
Showing
3 changed files
with
4 additions
and
4 deletions
@@ -63,6 +63,10 @@ export default { | @@ -63,6 +63,10 @@ export default { | ||
63 | clickButton(item) { | 63 | clickButton(item) { |
64 | let couponToken = item.couponToken; | 64 | let couponToken = item.couponToken; |
65 | 65 | ||
66 | + if (item.receive === 'Y') { | ||
67 | + return; | ||
68 | + } | ||
69 | + | ||
66 | this.getCoupon({couponToken: couponToken}).then(result => { | 70 | this.getCoupon({couponToken: couponToken}).then(result => { |
67 | console.log(result); | 71 | console.log(result); |
68 | this.$createDialog({ | 72 | this.$createDialog({ |
@@ -68,7 +68,6 @@ export default { | @@ -68,7 +68,6 @@ export default { | ||
68 | productId: productId, | 68 | productId: productId, |
69 | page: 1, | 69 | page: 1, |
70 | limit: 500, | 70 | limit: 500, |
71 | - debug: 'XYZ' | ||
72 | } | 71 | } |
73 | 72 | ||
74 | const result = await this.$api.post('/api/ufo/product/coupon', params); | 73 | const result = await this.$api.post('/api/ufo/product/coupon', params); |
@@ -82,7 +81,6 @@ export default { | @@ -82,7 +81,6 @@ export default { | ||
82 | async fetchProductCouponTopList({ commit }, { productId }) { | 81 | async fetchProductCouponTopList({ commit }, { productId }) { |
83 | let params = { | 82 | let params = { |
84 | productId: productId, | 83 | productId: productId, |
85 | - debug: 'XYZ' | ||
86 | } | 84 | } |
87 | 85 | ||
88 | const result = await this.$api.post('/api/ufo/product/couponTopList', params); | 86 | const result = await this.$api.post('/api/ufo/product/couponTopList', params); |
@@ -69,7 +69,6 @@ module.exports = { | @@ -69,7 +69,6 @@ module.exports = { | ||
69 | productId: {type: Number}, // 商品id | 69 | productId: {type: Number}, // 商品id |
70 | limit: { type: Number }, | 70 | limit: { type: Number }, |
71 | page: { type: Number }, | 71 | page: { type: Number }, |
72 | - debug: {type: String}, | ||
73 | }, | 72 | }, |
74 | }, | 73 | }, |
75 | 74 | ||
@@ -81,7 +80,6 @@ module.exports = { | @@ -81,7 +80,6 @@ module.exports = { | ||
81 | api: 'ufo.couponTopListOfPrdDetail.list', | 80 | api: 'ufo.couponTopListOfPrdDetail.list', |
82 | params: { | 81 | params: { |
83 | productId: {type: Number}, // 商品id | 82 | productId: {type: Number}, // 商品id |
84 | - debug: {type: String}, | ||
85 | }, | 83 | }, |
86 | }, | 84 | }, |
87 | 85 |
-
Please register or login to post a comment