Authored by 杨延青

Merge branch 'hotfix/coupon_check_online' into 'release/6.8.4'

Hotfix/coupon check online



See merge request !1642
... ... @@ -32,13 +32,17 @@ class CouponNew {
req.ctx(CouponNewModel).couponGet({ uid }),
req.ctx(CouponNewModel).getCouponNums({ uid })
]);
// console.log('api:', couponNumApi);
let pageData = _.get(couponsApi, 'data', {});
let couponNum = _.get(couponNumApi, 'data', null);
let couponNumStr = {
notuse: '0',
use: '0',
overtime: '0'
notuse: 0,
use: 0,
overtime: 0
};
let couponNum = Object.assign(couponNumStr, _.get(couponNumApi, 'data', null));
let couponList = _.get(pageData, 'couponList', []);
if (couponList && couponList.length) {
... ...
... ... @@ -29,7 +29,9 @@
<div class="stamp used-stamp"></div>
{{/if}}
{{^}}
<a href="{{useNowLink}}" class="use-now">立即使用</a>
{{#if is_online_avail}}
<a href="{{useNowLink}}" class="use-now">立即使用</a>
{{/if}}
{{#isEqualOr is_overdue_soon 'Y'}}
<span class="top-tip"></span>
{{/isEqualOr}}
... ...