Merge branch 'hotfix/couponHeader' into 'release/6.8.4'
Hotfix/coupon header See merge request !1645
Showing
2 changed files
with
24 additions
and
10 deletions
@@ -23,6 +23,10 @@ class ConponController extends Page { | @@ -23,6 +23,10 @@ class ConponController extends Page { | ||
23 | usedTip: $('.used-tip'), | 23 | usedTip: $('.used-tip'), |
24 | exchangeBox: $('.exchange-box') | 24 | exchangeBox: $('.exchange-box') |
25 | }; | 25 | }; |
26 | + | ||
27 | + if ($('#yoho-header').hasClass('hide')) { | ||
28 | + this.view.page.removeClass('cpage-padding284'); | ||
29 | + } | ||
26 | 30 | ||
27 | this.view.filterBtn.on('click', this.tabChange.bind(this)); | 31 | this.view.filterBtn.on('click', this.tabChange.bind(this)); |
28 | this.view.showFilterBtn.on('click', this.showFilter.bind(this)); | 32 | this.view.showFilterBtn.on('click', this.showFilter.bind(this)); |
@@ -8,15 +8,25 @@ body { | @@ -8,15 +8,25 @@ body { | ||
8 | left: 0; | 8 | left: 0; |
9 | } | 9 | } |
10 | 10 | ||
11 | -.cpage-padding284 { | ||
12 | - padding-top: 284px; | ||
13 | -} | ||
14 | - | ||
15 | -.cpage-padding194 { | 11 | +.coupon-new-page { |
16 | padding-top: 194px; | 12 | padding-top: 194px; |
17 | -} | 13 | + |
14 | + &.cpage-padding284 { | ||
15 | + padding-top: 284px; | ||
16 | + | ||
17 | + .filter-box { | ||
18 | + top: 106px; | ||
19 | + } | ||
20 | + | ||
21 | + .filter-item { | ||
22 | + top: 192px; | ||
23 | + } | ||
24 | + | ||
25 | + .exchange-box { | ||
26 | + top: 194px; | ||
27 | + } | ||
28 | + } | ||
18 | 29 | ||
19 | -.coupon-new-page { | ||
20 | .filter-box { | 30 | .filter-box { |
21 | width: 100%; | 31 | width: 100%; |
22 | height: 88px; | 32 | height: 88px; |
@@ -25,7 +35,7 @@ body { | @@ -25,7 +35,7 @@ body { | ||
25 | box-shadow: 0 0 16px 0 #eee; | 35 | box-shadow: 0 0 16px 0 #eee; |
26 | background-color: #fff; | 36 | background-color: #fff; |
27 | position: fixed; | 37 | position: fixed; |
28 | - top: 106px; | 38 | + top: 0; |
29 | left: 0; | 39 | left: 0; |
30 | z-index: 3; | 40 | z-index: 3; |
31 | 41 | ||
@@ -58,7 +68,7 @@ body { | @@ -58,7 +68,7 @@ body { | ||
58 | align-items: center; | 68 | align-items: center; |
59 | background-color: #fff; | 69 | background-color: #fff; |
60 | position: fixed; | 70 | position: fixed; |
61 | - top: 192px; | 71 | + top: 86px; |
62 | left: 0; | 72 | left: 0; |
63 | z-index: 3; | 73 | z-index: 3; |
64 | 74 | ||
@@ -84,7 +94,7 @@ body { | @@ -84,7 +94,7 @@ body { | ||
84 | padding: 16px 20px; | 94 | padding: 16px 20px; |
85 | background-color: #fff; | 95 | background-color: #fff; |
86 | position: fixed; | 96 | position: fixed; |
87 | - top: 194px; | 97 | + top: 88px; |
88 | left: 0; | 98 | left: 0; |
89 | z-index: 2; | 99 | z-index: 2; |
90 | 100 |
-
Please register or login to post a comment