Merge branch 'feature/coupon' into beta/wap
Showing
4 changed files
with
9 additions
and
8 deletions
@@ -39,7 +39,7 @@ class CouponFloorProcess | @@ -39,7 +39,7 @@ class CouponFloorProcess | ||
39 | foreach ($data as $k => &$v) { | 39 | foreach ($data as $k => &$v) { |
40 | $fun = ''; | 40 | $fun = ''; |
41 | if (empty($v) || !is_array($v) || !array_key_exists('template_name', $v)) { | 41 | if (empty($v) || !is_array($v) || !array_key_exists('template_name', $v)) { |
42 | - if (array_key_exists('templateName', $v)) { | 42 | + if (isset($v['templateName'])) { |
43 | $fun = $v['templateName']; | 43 | $fun = $v['templateName']; |
44 | } else { | 44 | } else { |
45 | continue; | 45 | continue; |
@@ -77,7 +77,7 @@ $('.coupon-floor a, .banner-top a').on('click', function() { | @@ -77,7 +77,7 @@ $('.coupon-floor a, .banner-top a').on('click', function() { | ||
77 | } | 77 | } |
78 | }); | 78 | }); |
79 | 79 | ||
80 | -if ($('.banner-swiper').find('li').size() > 1) { | 80 | +if ($('.banner-swiper').find('li').length > 1) { |
81 | bannerSwiper = new Swiper('.banner-swiper', { | 81 | bannerSwiper = new Swiper('.banner-swiper', { |
82 | lazyLoading: true, | 82 | lazyLoading: true, |
83 | lazyLoadingInPrevNext: true, | 83 | lazyLoadingInPrevNext: true, |
@@ -102,3 +102,8 @@ if ($('#noData').length > 0) { | @@ -102,3 +102,8 @@ if ($('#noData').length > 0) { | ||
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||
105 | +$mask.on('click',function () {s | ||
106 | + $mask.hide(); | ||
107 | + $message.hide(); | ||
108 | +}); | ||
109 | + |
1 | {{>layout/header}} | 1 | {{>layout/header}} |
2 | -<div class="coupon-area yoho-page"> | 2 | +<div class="coupon-area-page yoho-page"> |
3 | {{# content}} | 3 | {{# content}} |
4 | {{#if isSingleImage}} | 4 | {{#if isSingleImage}} |
5 | <a href="{{url}}"><img src="{{src}}" class="just-img"/></a> | 5 | <a href="{{url}}"><img src="{{src}}" class="just-img"/></a> |
-
Please register or login to post a comment