Showing
10 changed files
with
58 additions
and
222 deletions
1 | <div class="brand-page yoho-page"> | 1 | <div class="brand-page yoho-page"> |
2 | {{# channel}} | 2 | {{# channel}} |
3 | 3 | ||
4 | - <div class="genderNav"> | 4 | + <div class="gender-nav"> |
5 | <ul> | 5 | <ul> |
6 | {{# channels}} | 6 | {{# channels}} |
7 | <li {{#if active}}class="active"{{/if}} data-id="{{@index}}" data-name="{{channelName}}"> | 7 | <li {{#if active}}class="active"{{/if}} data-id="{{@index}}" data-name="{{channelName}}"> |
@@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
33 | {{/ hotBrandsScroll}} | 33 | {{/ hotBrandsScroll}} |
34 | {{/ topData}} | 34 | {{/ topData}} |
35 | 35 | ||
36 | - <div class="brandNav"> | 36 | + <div class="brand-nav"> |
37 | <ul> | 37 | <ul> |
38 | <li class="allbrand active" data-id="0"> | 38 | <li class="allbrand active" data-id="0"> |
39 | <span>{{brandType}}</span> | 39 | <span>{{brandType}}</span> |
@@ -17,8 +17,8 @@ let $brandList, | @@ -17,8 +17,8 @@ let $brandList, | ||
17 | $newBrandWall, | 17 | $newBrandWall, |
18 | $recommandBrandWall, | 18 | $recommandBrandWall, |
19 | $icon = $('.search-icon'), | 19 | $icon = $('.search-icon'), |
20 | - $genderItem = $('.genderNav li'), | ||
21 | - $brandItem = $('.brandNav li'), | 20 | + $genderItem = $('.gender-nav li'), |
21 | + $brandItem = $('.brand-nav li'), | ||
22 | $searchAction = $('.search-action'), | 22 | $searchAction = $('.search-action'), |
23 | $homebuttom = $('.homebuttom'), | 23 | $homebuttom = $('.homebuttom'), |
24 | $newSearch = $('.newbrand-search'), | 24 | $newSearch = $('.newbrand-search'), |
@@ -258,7 +258,7 @@ function searchResult() { | @@ -258,7 +258,7 @@ function searchResult() { | ||
258 | 258 | ||
259 | (function() { | 259 | (function() { |
260 | if ($('.banner-top').length === 0) { | 260 | if ($('.banner-top').length === 0) { |
261 | - let h1 = $('.genderNav').height(); | 261 | + let h1 = $('.gender-nav').height(); |
262 | let h2 = $('.newbrand-search').height(); | 262 | let h2 = $('.newbrand-search').height(); |
263 | 263 | ||
264 | $('.hot-brands').css('padding-top', (h1 + h2) + 'px'); | 264 | $('.hot-brands').css('padding-top', (h1 + h2) + 'px'); |
@@ -295,7 +295,7 @@ function searchResult() { | @@ -295,7 +295,7 @@ function searchResult() { | ||
295 | $brandItem.on('click', function() { | 295 | $brandItem.on('click', function() { |
296 | let index = $(this).data('id'); | 296 | let index = $(this).data('id'); |
297 | 297 | ||
298 | - $('.brandNav ul .active').removeClass('active'); | 298 | + $('.brand-nav ul .active').removeClass('active'); |
299 | $(this).addClass('active'); | 299 | $(this).addClass('active'); |
300 | if (index === 0) { | 300 | if (index === 0) { |
301 | $recommandBrandWall.not('.hide').addClass('hide'); | 301 | $recommandBrandWall.not('.hide').addClass('hide'); |
@@ -4,43 +4,6 @@ | @@ -4,43 +4,6 @@ | ||
4 | max-width: 640px; | 4 | max-width: 640px; |
5 | overflow: hidden; | 5 | overflow: hidden; |
6 | 6 | ||
7 | - .banner-top { | ||
8 | - position: relative; | ||
9 | - margin-bottom: -2PX; | ||
10 | - | ||
11 | - .swiper-pagination { | ||
12 | - position: absolute; | ||
13 | - left: 0; | ||
14 | - right: 0; | ||
15 | - bottom: 20px; | ||
16 | - text-align: center; | ||
17 | - z-index: 1; | ||
18 | - | ||
19 | - .pagination-inner { | ||
20 | - display: inline-block; | ||
21 | - padding: 0 8px 4px; | ||
22 | - background: rgba(0, 0, 0, 0.2); | ||
23 | - border-radius: 50px; | ||
24 | - line-height: 1.2; | ||
25 | - | ||
26 | - span { | ||
27 | - display: inline-block; | ||
28 | - width: 14px; | ||
29 | - height: 14px; | ||
30 | - background: #fff; | ||
31 | - opacity: 0.5; | ||
32 | - margin: 0 9px; | ||
33 | - border-radius: 50%; | ||
34 | - | ||
35 | - &.swiper-pagination-bullet-active { | ||
36 | - background: #fff; | ||
37 | - opacity: 1; | ||
38 | - } | ||
39 | - } | ||
40 | - } | ||
41 | - } | ||
42 | - } | ||
43 | - | ||
44 | .swiper-slide { | 7 | .swiper-slide { |
45 | img { | 8 | img { |
46 | max-width: 640px; | 9 | max-width: 640px; |
@@ -49,6 +12,43 @@ | @@ -49,6 +12,43 @@ | ||
49 | } | 12 | } |
50 | } | 13 | } |
51 | 14 | ||
15 | +.coupon-area-page .banner-top { | ||
16 | + position: relative; | ||
17 | + margin-bottom: -2PX; | ||
18 | + | ||
19 | + .swiper-pagination { | ||
20 | + position: absolute; | ||
21 | + left: 0; | ||
22 | + right: 0; | ||
23 | + bottom: 20px; | ||
24 | + text-align: center; | ||
25 | + z-index: 1; | ||
26 | + | ||
27 | + .pagination-inner { | ||
28 | + display: inline-block; | ||
29 | + padding: 0 8px 4px; | ||
30 | + background: rgba(0, 0, 0, 0.2); | ||
31 | + border-radius: 50px; | ||
32 | + line-height: 1.2; | ||
33 | + | ||
34 | + span { | ||
35 | + display: inline-block; | ||
36 | + width: 14px; | ||
37 | + height: 14px; | ||
38 | + background: #fff; | ||
39 | + opacity: 0.5; | ||
40 | + margin: 0 9px; | ||
41 | + border-radius: 50%; | ||
42 | + | ||
43 | + &.swiper-pagination-bullet-active { | ||
44 | + background: #fff; | ||
45 | + opacity: 1; | ||
46 | + } | ||
47 | + } | ||
48 | + } | ||
49 | + } | ||
50 | +} | ||
51 | + | ||
52 | .just-img { | 52 | .just-img { |
53 | width: 100%; | 53 | width: 100%; |
54 | float: left; | 54 | float: left; |
@@ -196,4 +196,4 @@ | @@ -196,4 +196,4 @@ | ||
196 | height: 56px; | 196 | height: 56px; |
197 | text-align: center; | 197 | text-align: center; |
198 | } | 198 | } |
199 | -} | ||
199 | +} |
@@ -127,7 +127,6 @@ body.disable-default-action { | @@ -127,7 +127,6 @@ body.disable-default-action { | ||
127 | max-width: 790px; | 127 | max-width: 790px; |
128 | height: auto; | 128 | height: auto; |
129 | margin: 0 auto; | 129 | margin: 0 auto; |
130 | - /*overflow: hidden;*/ | ||
131 | } | 130 | } |
132 | 131 | ||
133 | .banner { | 132 | .banner { |
@@ -160,10 +159,6 @@ body.disable-default-action { | @@ -160,10 +159,6 @@ body.disable-default-action { | ||
160 | height: 19.775rem; | 159 | height: 19.775rem; |
161 | } | 160 | } |
162 | 161 | ||
163 | -/*.slide-box .swiper-wrapper { | ||
164 | - padding: 0px 4.578rem; | ||
165 | -}*/ | ||
166 | - | ||
167 | .slide-box .swiper-slide { | 162 | .slide-box .swiper-slide { |
168 | float: left; | 163 | float: left; |
169 | width: 16rem; | 164 | width: 16rem; |
@@ -268,9 +268,6 @@ | @@ -268,9 +268,6 @@ | ||
268 | color: #b0b0b0; | 268 | color: #b0b0b0; |
269 | overflow: hidden; | 269 | overflow: hidden; |
270 | white-space: nowrap; | 270 | white-space: nowrap; |
271 | - color: #b0b0b0; | ||
272 | - overflow: hidden; | ||
273 | - white-space: nowrap; | ||
274 | } | 271 | } |
275 | 272 | ||
276 | span.disabled { | 273 | span.disabled { |
1 | .pay-back-page { | 1 | .pay-back-page { |
2 | - font-family: helvetica,Arial,黑体; | 2 | + font-family: helvetica, Arial, 黑体; |
3 | 3 | ||
4 | .failure-order { | 4 | .failure-order { |
5 | margin-top: 140px; | 5 | margin-top: 140px; |
@@ -24,4 +24,4 @@ | @@ -24,4 +24,4 @@ | ||
24 | margin-right: 10px; | 24 | margin-right: 10px; |
25 | } | 25 | } |
26 | } | 26 | } |
27 | -} | ||
27 | +} |
@@ -36,17 +36,17 @@ | @@ -36,17 +36,17 @@ | ||
36 | opacity: 0.5; | 36 | opacity: 0.5; |
37 | margin: 0 9px; | 37 | margin: 0 9px; |
38 | border-radius: 50%; | 38 | border-radius: 50%; |
39 | + } | ||
39 | 40 | ||
40 | - &.swiper-pagination-bullet-active { | ||
41 | - background: #fff; | ||
42 | - opacity: 1; | ||
43 | - } | 41 | + .swiper-pagination-bullet-active { |
42 | + background: #fff; | ||
43 | + opacity: 1; | ||
44 | } | 44 | } |
45 | } | 45 | } |
46 | } | 46 | } |
47 | } | 47 | } |
48 | 48 | ||
49 | - .genderNav { | 49 | + .gender-nav { |
50 | display: block; | 50 | display: block; |
51 | width: 100%; | 51 | width: 100%; |
52 | height: 40PX; | 52 | height: 40PX; |
@@ -109,7 +109,7 @@ | @@ -109,7 +109,7 @@ | ||
109 | } | 109 | } |
110 | } | 110 | } |
111 | 111 | ||
112 | - .brandNav { | 112 | + .brand-nav { |
113 | display: block; | 113 | display: block; |
114 | width: 100%; | 114 | width: 100%; |
115 | line-height: 80px; | 115 | line-height: 80px; |
1 | -/*.search-page { | ||
2 | - .search-input { | ||
3 | - position: relative; | ||
4 | - padding: 14px 22px; | ||
5 | - background: #f8f8f8; | ||
6 | - form { | ||
7 | - width: 100%; | ||
8 | - } | ||
9 | - .search-icon { | ||
10 | - position: absolute; | ||
11 | - font-size: 24px; | ||
12 | - top: 26px; | ||
13 | - left: 36px; | ||
14 | - color: #b2b2b2; | ||
15 | - } | ||
16 | - | ||
17 | - input { | ||
18 | - height: 56px; | ||
19 | - width: 378px; | ||
20 | - border-radius: 28px; | ||
21 | - padding: 0 52px; | ||
22 | - font-size: 24px; | ||
23 | - background: #fff; | ||
24 | - border: none; | ||
25 | - } | ||
26 | - | ||
27 | - .clear-input { | ||
28 | - position: absolute; | ||
29 | - top: 20px; | ||
30 | - right: 145px; | ||
31 | - font-size: 32px; | ||
32 | - color: #666; | ||
33 | - } | ||
34 | - | ||
35 | - .search { | ||
36 | - position: absolute; | ||
37 | - top: 18px; | ||
38 | - right: 40px; | ||
39 | - border: none; | ||
40 | - background: transparent; | ||
41 | - color: #666; | ||
42 | - font-size: 30px; | ||
43 | - line-height: 56px; | ||
44 | - } | ||
45 | - } | ||
46 | - | ||
47 | - .search-items { | ||
48 | - padding: 40px 20px; | ||
49 | - | ||
50 | - h3 { | ||
51 | - font-size: 24px; | ||
52 | - margin-bottom: 20px; | ||
53 | - } | ||
54 | - | ||
55 | - li { | ||
56 | - float: left; | ||
57 | - margin-right: 20px; | ||
58 | - margin-bottom: 20px; | ||
59 | - max-width: 100%; | ||
60 | - overflow: hidden; | ||
61 | - } | ||
62 | - | ||
63 | - a { | ||
64 | - display: block; | ||
65 | - height: 68px; | ||
66 | - line-height: 68px; | ||
67 | - padding: 0 20px; | ||
68 | - font-size: 28px; | ||
69 | - background: #f8f8f8; | ||
70 | - color: #000; | ||
71 | - overflow: hidden; | ||
72 | - text-overflow: ellipsis; | ||
73 | - white-space: nowrap; | ||
74 | - } | ||
75 | - | ||
76 | - .clear-icon { | ||
77 | - float: right; | ||
78 | - background: #fff; | ||
79 | - } | ||
80 | - | ||
81 | - span { | ||
82 | - margin-right: 5px; | ||
83 | - } | ||
84 | - | ||
85 | - .search-group { | ||
86 | - | ||
87 | - .ico-hot { | ||
88 | - width: 22px; | ||
89 | - height: 30px; | ||
90 | - display: inline-block; | ||
91 | - background: url('/search/hot-ico.png') no-repeat; | ||
92 | - margin-right: 20px; | ||
93 | - position: relative; | ||
94 | - top: 2px; | ||
95 | - } | ||
96 | - | ||
97 | - h3 { | ||
98 | - color: #b0b0b0; | ||
99 | - font-size: 28px; | ||
100 | - } | ||
101 | - } | ||
102 | - | ||
103 | - .search-content-title { | ||
104 | - height: 40px; | ||
105 | - | ||
106 | - .ico-lately { | ||
107 | - width: 26px; | ||
108 | - height: 26px; | ||
109 | - display: inline-block; | ||
110 | - background: url('/search/time-ico.png') no-repeat; | ||
111 | - margin-right: 20px; | ||
112 | - position: relative; | ||
113 | - top: 2px; | ||
114 | - } | ||
115 | - | ||
116 | - .ico-del { | ||
117 | - width: 24px; | ||
118 | - height: 26px; | ||
119 | - display: inline-block; | ||
120 | - background: url('/search/del-ico.png') no-repeat; | ||
121 | - } | ||
122 | - | ||
123 | - .left { | ||
124 | - float: left; | ||
125 | - } | ||
126 | - | ||
127 | - .right { | ||
128 | - float: right; | ||
129 | - } | ||
130 | - } | ||
131 | - | ||
132 | - .search-content{ | ||
133 | - clear: both; | ||
134 | - box-sizing: border-box; | ||
135 | - padding-bottom: 18px; | ||
136 | - | ||
137 | - a { | ||
138 | - border-radius: 8px; | ||
139 | - border: 2px solid #b0b0b0; | ||
140 | - background: #fff; | ||
141 | - color: #b0b0b0; | ||
142 | - font-size: 28px; | ||
143 | - } | ||
144 | - } | ||
145 | - | ||
146 | - .hot-search { | ||
147 | - margin-top: 38px; | ||
148 | - } | ||
149 | - } | ||
150 | - | ||
151 | -}*/ | ||
152 | - | ||
153 | .search-associate { | 1 | .search-associate { |
154 | width: 100%; | 2 | width: 100%; |
155 | background: #f8f8f8; | 3 | background: #f8f8f8; |
@@ -299,4 +147,4 @@ | @@ -299,4 +147,4 @@ | ||
299 | font-size: 24px; | 147 | font-size: 24px; |
300 | } | 148 | } |
301 | } | 149 | } |
302 | -} | ||
150 | +} |
1 | -/* dialog */ | ||
2 | .dialog-wrapper { | 1 | .dialog-wrapper { |
3 | background: hsla(0, 0%, 0%, 0.5); | 2 | background: hsla(0, 0%, 0%, 0.5); |
4 | position: fixed; | 3 | position: fixed; |
@@ -55,8 +54,7 @@ | @@ -55,8 +54,7 @@ | ||
55 | } | 54 | } |
56 | } | 55 | } |
57 | 56 | ||
58 | - /*边框在物理机上1px变粗*/ | ||
59 | - .dialog-footer::before { | 57 | + .dialog-footer:before { |
60 | content: ""; | 58 | content: ""; |
61 | position: absolute; | 59 | position: absolute; |
62 | left: 0; | 60 | left: 0; |
@@ -65,7 +63,5 @@ | @@ -65,7 +63,5 @@ | ||
65 | border-top: 1px solid #ccc; | 63 | border-top: 1px solid #ccc; |
66 | transform-origin: left top; | 64 | transform-origin: left top; |
67 | transform: scale3d(0.5, 0.5, 0.5); | 65 | transform: scale3d(0.5, 0.5, 0.5); |
68 | - -webkit-transform: scale3d(0.5, 0.5, 0.5); /* Chrome, Safari, Opera */ | ||
69 | - -ms-transform: scale3d(0.5, 0.5, 0.5); /* IE 9 */ | ||
70 | } | 66 | } |
71 | } | 67 | } |
-
Please register or login to post a comment