diff --git a/static/js/index/coupon.js b/static/js/index/coupon.js index 81e16b4..c9e18df 100644 --- a/static/js/index/coupon.js +++ b/static/js/index/coupon.js @@ -20,7 +20,7 @@ $receive.on('click', function() { if (data.noLogin === true) { location.href = data.url + '?contentCode=' + getUrlParam('contentCode'); } else { - if (!status) { + if (status) { $curDom.hide(); $curDom.next().show(); $tooltip.show(); diff --git a/static/sass/home/_coupon.scss b/static/sass/home/_coupon.scss index 06dcb29..2618914 100644 --- a/static/sass/home/_coupon.scss +++ b/static/sass/home/_coupon.scss @@ -1,5 +1,6 @@ .coupon-floor { float: left; + width:100%; .floor-title { background-color: #fff; text-align: center; @@ -13,25 +14,24 @@ width: 100%; background-size: 100%; background-repeat: no-repeat; - background-color: #000; - padding: 0 30rem / $pxConvertRem; + padding: 10rem / $pxConvertRem 30rem / $pxConvertRem; box-sizing: border-box; float: left; .main-left { float: left; width: 467rem / $pxConvertRem; - height: 180rem / $pxConvertRem; + height: 160rem / $pxConvertRem; } - .main-right-receive, .main-right-use, .main-right-go { + .main-right-receive, .main-right-use, .main-right-go { float: right; width: 113rem / $pxConvertRem; - height: 180rem / $pxConvertRem; + height: 160rem / $pxConvertRem; position: relative; span { - background-repeat:no-repeat; + background-repeat: no-repeat; background-size: contain; &.on-receive { @@ -42,7 +42,7 @@ display: inline-block; width: 52rem / $pxConvertRem; height: 54rem / $pxConvertRem; - background-image:image-url('coupon/click-txt.png'); + background-image: image-url('coupon/click-txt.png'); } &.received { @@ -82,10 +82,10 @@ position: fixed; top: 50%; left: 50%; - width: 550rem / $pxConvertRem; - height: 250rem / $pxConvertRem; - margin-left: -275rem / $pxConvertRem; - margin-top: -125rem / $pxConvertRem; + width: 550rem/$pxConvertRem; + height: 250rem/$pxConvertRem; + margin-left: -275rem/$pxConvertRem; + margin-top: -125rem/$pxConvertRem; z-index: 10; background-color: rgba(250, 250, 250, .92); display: none; @@ -93,17 +93,17 @@ .coupon-message-content { border-bottom: 1px solid rgb(197, 197, 197); - height: 160rem / $pxConvertRem; + height: 160rem/$pxConvertRem; text-align: center; - line-height: 160rem / $pxConvertRem; - font-size: 28rem / $pxConvertRem; + line-height: 160rem/$pxConvertRem; + font-size: 28rem/$pxConvertRem; } .coupon-message-op { - height: 90rem / $pxConvertRem; + height: 90rem/$pxConvertRem; text-align: center; - line-height: 90rem / $pxConvertRem; - font-size: 32rem / $pxConvertRem; + line-height: 90rem/$pxConvertRem; + font-size: 32rem/$pxConvertRem; color: rgb(223, 98, 112); } } @@ -112,24 +112,24 @@ position: fixed; top: 50%; left: 50%; - width: 220rem / $pxConvertRem; - height: 140rem / $pxConvertRem; - margin-left: -110rem / $pxConvertRem; - margin-top: -70rem / $pxConvertRem; + width: 220rem/$pxConvertRem; + height: 140rem/$pxConvertRem; + margin-left: -110rem/$pxConvertRem; + margin-top: -70rem/$pxConvertRem; z-index: 11; background-color: rgba(60, 60, 60, .7); display: none; - border-radius: 8rem / $pxConvertRem; + border-radius: 8rem/$pxConvertRem; color: #fff; .icon-box{ - height: 84rem / $pxConvertRem; - line-height: 84rem / $pxConvertRem; + height: 84rem/$pxConvertRem; + line-height: 84rem/$pxConvertRem; text-align: center; } .icon-msg{ - height: 56rem / $pxConvertRem; + height: 56rem/$pxConvertRem; text-align: center; } } \ No newline at end of file diff --git a/template/m.yohobuy.com/actions/index/coupon/index.phtml b/template/m.yohobuy.com/actions/index/coupon/index.phtml index 15908bd..84e4b76 100644 --- a/template/m.yohobuy.com/actions/index/coupon/index.phtml +++ b/template/m.yohobuy.com/actions/index/coupon/index.phtml @@ -1,5 +1,6 @@ {{>layout/header}} -{{# content}} +{{>home/baner_top}} +{{# floor}} {{#if isCoupon}} <div class="coupon-floor"> {{#if showFloorTitle}} @@ -30,7 +31,7 @@ </div> </div> {{/if}} -{{/ content}} +{{/ floor}} <div class="floor-mask"></div> <div class="floor-message"> <div class="coupon-message-content"></div>