Merge branch 'release/5.0.0' of git.yoho.cn:fe/yohobuywap-node into release/5.0.0
Showing
4 changed files
with
1 additions
and
11 deletions
@@ -201,7 +201,7 @@ exports.index = (req, res, next) => { | @@ -201,7 +201,7 @@ exports.index = (req, res, next) => { | ||
201 | } | 201 | } |
202 | 202 | ||
203 | return userAcquireStatus(uid, couponids.join(',')).then((cous) => { | 203 | return userAcquireStatus(uid, couponids.join(',')).then((cous) => { |
204 | - coupons.data = (coupons.data || []).map((item)=>{ | 204 | + coupons.data = _.get(coupons, 'data', []).map((item)=>{ |
205 | item.status = 1; | 205 | item.status = 1; |
206 | (cous.data || []).forEach((it) => { | 206 | (cous.data || []).forEach((it) => { |
207 | 207 |
public/img/product/limit.png
deleted
100644 → 0

25.2 KB
@@ -101,10 +101,6 @@ function search() { | @@ -101,10 +101,6 @@ function search() { | ||
101 | searching = false; | 101 | searching = false; |
102 | end = true; | 102 | end = true; |
103 | loading.hideLoadingMask(); | 103 | loading.hideLoadingMask(); |
104 | - | ||
105 | - if ($('#productDesc').hasClass('limit')) { | ||
106 | - $('#productDesc').find('.service').removeClass('service').addClass('limit-service'); | ||
107 | - } | ||
108 | }, | 104 | }, |
109 | error: function() { | 105 | error: function() { |
110 | tip.show('网络断开连接了~'); | 106 | tip.show('网络断开连接了~'); |
-
Please register or login to post a comment