Merge remote-tracking branch 'origin/feature/indexcss' into feature/webpack2
Showing
62 changed files
with
483 additions
and
1040 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> |
| @@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
| 47 | "request": "^2.81.0", | 47 | "request": "^2.81.0", |
| 48 | "request-promise": "^3.0.0", | 48 | "request-promise": "^3.0.0", |
| 49 | "serve-favicon": "^2.4.0", | 49 | "serve-favicon": "^2.4.0", |
| 50 | - "uuid": "^2.0.3", | 50 | + "uuid": "^3.0.1", |
| 51 | "xml2js": "^0.4.17", | 51 | "xml2js": "^0.4.17", |
| 52 | "yoho-express-session": "^2.0.0", | 52 | "yoho-express-session": "^2.0.0", |
| 53 | "yoho-node-lib": "^0.2.8", | 53 | "yoho-node-lib": "^0.2.8", |
| @@ -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'); |
| 1 | var $ = require('yoho-jquery'); | 1 | var $ = require('yoho-jquery'); |
| 2 | 2 | ||
| 3 | // $('body').height($(window).height()); | 3 | // $('body').height($(window).height()); |
| 4 | -// $('.app_update').height($(window).height()).width($(window).width()); | 4 | +// $('.app-update').height($(window).height()).width($(window).width()); |
| 5 | 5 | ||
| 6 | $('button').on('click', function() { | 6 | $('button').on('click', function() { |
| 7 | window.location = 'http://www.yohoshow.com/about/index/yohobuyqr'; | 7 | window.location = 'http://www.yohoshow.com/about/index/yohobuyqr'; |
| @@ -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 | +} |
| @@ -176,7 +176,7 @@ | @@ -176,7 +176,7 @@ | ||
| 176 | display: inline-block; | 176 | display: inline-block; |
| 177 | width: 139px; | 177 | width: 139px; |
| 178 | height: 42px; | 178 | height: 42px; |
| 179 | - align: center; | 179 | + text-align: center; |
| 180 | font-size: 24px; | 180 | font-size: 24px; |
| 181 | color: #fff; | 181 | color: #fff; |
| 182 | margin: 0 40%; | 182 | margin: 0 40%; |
| @@ -23,10 +23,6 @@ | @@ -23,10 +23,6 @@ | ||
| 23 | margin-bottom: 10px; | 23 | margin-bottom: 10px; |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | - .intro-title { | ||
| 27 | - // margin-top: 90px; | ||
| 28 | - } | ||
| 29 | - /* 手机号 领福利 */ | ||
| 30 | .invite-content-page { | 26 | .invite-content-page { |
| 31 | text-align: center; | 27 | text-align: center; |
| 32 | color: #fff; | 28 | color: #fff; |
| @@ -274,9 +274,6 @@ | @@ -274,9 +274,6 @@ | ||
| 274 | color: #b0b0b0; | 274 | color: #b0b0b0; |
| 275 | overflow: hidden; | 275 | overflow: hidden; |
| 276 | white-space: nowrap; | 276 | white-space: nowrap; |
| 277 | - color: #b0b0b0; | ||
| 278 | - overflow: hidden; | ||
| 279 | - white-space: nowrap; | ||
| 280 | } | 277 | } |
| 281 | 278 | ||
| 282 | span.disabled { | 279 | span.disabled { |
| @@ -203,14 +203,14 @@ | @@ -203,14 +203,14 @@ | ||
| 203 | li { | 203 | li { |
| 204 | border-bottom: 1px solid #fff; | 204 | border-bottom: 1px solid #fff; |
| 205 | padding: 0 40px; | 205 | padding: 0 40px; |
| 206 | + } | ||
| 206 | 207 | ||
| 207 | - &:last-child { | ||
| 208 | - border-bottom: none; | ||
| 209 | - } | 208 | + li > i { |
| 209 | + float: right; | ||
| 210 | + } | ||
| 210 | 211 | ||
| 211 | - i { | ||
| 212 | - float: right; | ||
| 213 | - } | 212 | + li:last-child { |
| 213 | + border-bottom: none; | ||
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | li.dispatch-time-info { | 216 | li.dispatch-time-info { |
| @@ -318,9 +318,9 @@ | @@ -318,9 +318,9 @@ | ||
| 318 | width: 100%; | 318 | width: 100%; |
| 319 | height: 100%; | 319 | height: 100%; |
| 320 | background: #000; | 320 | background: #000; |
| 321 | - filter: alpha(opacity=70); /*IE滤镜，透明度70%*/ | ||
| 322 | - -moz-opacity: 0.7; /*Firefox私有，透明度70%*/ | ||
| 323 | - opacity: 0.7;/*其他，透明度70%*/ | 321 | + filter: alpha(opacity=70); |
| 322 | + -moz-opacity: 0.7; | ||
| 323 | + opacity: 0.7; | ||
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | span { | 326 | span { |
| @@ -401,7 +401,6 @@ | @@ -401,7 +401,6 @@ | ||
| 401 | .name { | 401 | .name { |
| 402 | font-size: 32px; | 402 | font-size: 32px; |
| 403 | max-width: 70%; | 403 | max-width: 70%; |
| 404 | - text-overflow: -o-ellipsis-lastline; | ||
| 405 | overflow: hidden; | 404 | overflow: hidden; |
| 406 | text-overflow: ellipsis; | 405 | text-overflow: ellipsis; |
| 407 | display: -webkit-box; | 406 | display: -webkit-box; |
| 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 | } |
| @@ -51,7 +51,7 @@ body { | @@ -51,7 +51,7 @@ body { | ||
| 51 | color: #333; | 51 | color: #333; |
| 52 | text-align: center; | 52 | text-align: center; |
| 53 | font-size: 12px; | 53 | font-size: 12px; |
| 54 | - font-family: helvetica,Arial,黑体; | 54 | + font-family: helvetica, Arial, 黑体; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | ul, | 57 | ul, |
| @@ -119,7 +119,6 @@ body { | @@ -119,7 +119,6 @@ body { | ||
| 119 | display: none; | 119 | display: none; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | - /*顶悬浮*/ | ||
| 123 | &.fixnav { | 122 | &.fixnav { |
| 124 | position: fixed; | 123 | position: fixed; |
| 125 | top: 0; | 124 | top: 0; |
| @@ -151,33 +150,3 @@ body { | @@ -151,33 +150,3 @@ body { | ||
| 151 | height: 100%; | 150 | height: 100%; |
| 152 | } | 151 | } |
| 153 | } | 152 | } |
| 154 | - | ||
| 155 | -/*弹窗*/ | ||
| 156 | -.tc_box { | ||
| 157 | - position: fixed; | ||
| 158 | - width: 100%; | ||
| 159 | - height: 100%; | ||
| 160 | - top: 0; | ||
| 161 | - left: 0; | ||
| 162 | - margin: 0 auto; | ||
| 163 | - display: none; | ||
| 164 | - z-index: 1000; | ||
| 165 | -} | ||
| 166 | - | ||
| 167 | -.tc_bg { | ||
| 168 | - width: 100%; | ||
| 169 | - height: 100%; | ||
| 170 | - background: rgba(0, 0, 0, 0.5); | ||
| 171 | - margin: 0 auto; | ||
| 172 | - z-index: 1001; | ||
| 173 | -} | ||
| 174 | - | ||
| 175 | -.tc_con { | ||
| 176 | - position: fixed; | ||
| 177 | - top: 50%; | ||
| 178 | - left: 3.9%; | ||
| 179 | - width: 92.2%; | ||
| 180 | - margin-top: -200px; | ||
| 181 | - z-index: 1000000; | ||
| 182 | - display: block; | ||
| 183 | -} |
| 1 | @charset "utf-8"; | 1 | @charset "utf-8"; |
| 2 | -/* CSS Document */ | ||
| 3 | 2 | ||
| 4 | /** | 3 | /** |
| 5 | * Swiper 3.1.7 | 4 | * Swiper 3.1.7 |
| 6 | * Most modern mobile touch slider and framework with hardware accelerated transitions | 5 | * Most modern mobile touch slider and framework with hardware accelerated transitions |
| 7 | - * | 6 | + * |
| 8 | * http://www.idangero.us/swiper/ | 7 | * http://www.idangero.us/swiper/ |
| 9 | - * | 8 | + * |
| 10 | * Copyright 2015, Vladimir Kharlampidi | 9 | * Copyright 2015, Vladimir Kharlampidi |
| 11 | * The iDangero.us | 10 | * The iDangero.us |
| 12 | * http://www.idangero.us/ | 11 | * http://www.idangero.us/ |
| 13 | - * | 12 | + * |
| 14 | * Licensed under MIT | 13 | * Licensed under MIT |
| 15 | - * | 14 | + * |
| 16 | * Released on: October 10, 2015 | 15 | * Released on: October 10, 2015 |
| 17 | */ | 16 | */ |
| 18 | .swiper-container { | 17 | .swiper-container { |
| 19 | margin: 0 auto; | 18 | margin: 0 auto; |
| 20 | position: relative; | 19 | position: relative; |
| 21 | overflow: hidden; | 20 | overflow: hidden; |
| 22 | - /*z-index: 1*/ | ||
| 23 | } | 21 | } |
| 24 | 22 | ||
| 25 | .swiper-container-no-flexbox .swiper-slide { | 23 | .swiper-container-no-flexbox .swiper-slide { |
public/scss/guang/_cate-all.css
deleted
100644 → 0
| 1 | -.blk-cate-all { | ||
| 2 | - font-size: 15PX; | ||
| 3 | - | ||
| 4 | - .category-nav { | ||
| 5 | - height: 80px; | ||
| 6 | - border-bottom: 1px solid #e6e6e6; | ||
| 7 | - width: 100%; | ||
| 8 | - background: #fff; | ||
| 9 | - z-index: 10; | ||
| 10 | - | ||
| 11 | - li { | ||
| 12 | - display: block; | ||
| 13 | - box-sizing: border-box; | ||
| 14 | - float: left; | ||
| 15 | - height: 100%; | ||
| 16 | - padding: 20px 0; | ||
| 17 | - width: 50%; | ||
| 18 | - text-align: center; | ||
| 19 | - color: #999; | ||
| 20 | - | ||
| 21 | - &:last-child { | ||
| 22 | - border-right: none; | ||
| 23 | - } | ||
| 24 | - | ||
| 25 | - &.focus { | ||
| 26 | - color: #000; | ||
| 27 | - } | ||
| 28 | - | ||
| 29 | - &.bytouch { | ||
| 30 | - background: #eee; | ||
| 31 | - } | ||
| 32 | - } | ||
| 33 | - | ||
| 34 | - span { | ||
| 35 | - display: block; | ||
| 36 | - width: 100%; | ||
| 37 | - height: 30px; | ||
| 38 | - line-height: 30px; | ||
| 39 | - font-size: 80%; | ||
| 40 | - } | ||
| 41 | - } | ||
| 42 | - | ||
| 43 | - .loca { | ||
| 44 | - position: fixed; | ||
| 45 | - top: 88px; | ||
| 46 | - } | ||
| 47 | - | ||
| 48 | - .content { | ||
| 49 | - overflow: hidden; | ||
| 50 | - position: relative; | ||
| 51 | - | ||
| 52 | - &.hide { | ||
| 53 | - display: none; | ||
| 54 | - } | ||
| 55 | - } | ||
| 56 | - | ||
| 57 | - .living { | ||
| 58 | - margin-top: 160px; | ||
| 59 | - } | ||
| 60 | - | ||
| 61 | - .primary-level { | ||
| 62 | - float: left; | ||
| 63 | - box-sizing: border-box; | ||
| 64 | - width: 45%; | ||
| 65 | - | ||
| 66 | - > li { | ||
| 67 | - height: 89px; | ||
| 68 | - line-height: 89px; | ||
| 69 | - padding: 0 32px; | ||
| 70 | - white-space: nowrap; | ||
| 71 | - overflow: hidden; | ||
| 72 | - text-overflow: ellipsis; | ||
| 73 | - border-bottom: 1px solid #e6e6e6; | ||
| 74 | - | ||
| 75 | - &.focus { | ||
| 76 | - background-color: #fff; | ||
| 77 | - } | ||
| 78 | - | ||
| 79 | - &.highlight { | ||
| 80 | - background-color: #eee; | ||
| 81 | - } | ||
| 82 | - } | ||
| 83 | - } | ||
| 84 | - | ||
| 85 | - .trilanglefont { | ||
| 86 | - font-family: "iconfont" !important; | ||
| 87 | - font-size: 30px; | ||
| 88 | - font-style: normal; | ||
| 89 | - text-decoration: none; | ||
| 90 | - -webkit-font-smoothing: antialiased; | ||
| 91 | - -webkit-text-stroke-width: 0.2px; | ||
| 92 | - -moz-osx-font-smoothing: grayscale; | ||
| 93 | - color: #f4f4f4; | ||
| 94 | - } | ||
| 95 | - | ||
| 96 | - .primary-level-trilangle { | ||
| 97 | - float: right; | ||
| 98 | - background-image: url(/product/arrow.png) no-repeat; | ||
| 99 | - margin-top: 22px; | ||
| 100 | - width: 20px; | ||
| 101 | - height: 46px; | ||
| 102 | - position: relative; | ||
| 103 | - right: -32px; | ||
| 104 | - } | ||
| 105 | - | ||
| 106 | - .sub-level-container { | ||
| 107 | - float: left; | ||
| 108 | - overflow-x: auto; | ||
| 109 | - box-sizing: border-box; | ||
| 110 | - background: #fff; | ||
| 111 | - width: 55%; | ||
| 112 | - height: 100%; | ||
| 113 | - background: #f4f4f4; | ||
| 114 | - } | ||
| 115 | - | ||
| 116 | - .sub-level { | ||
| 117 | - width: 100%; | ||
| 118 | - height: 100%; | ||
| 119 | - | ||
| 120 | - &.hide { | ||
| 121 | - display: none; | ||
| 122 | - } | ||
| 123 | - | ||
| 124 | - > li { | ||
| 125 | - box-sizing: border-box; | ||
| 126 | - height: 79px; | ||
| 127 | - line-height: 79px; | ||
| 128 | - border-bottom: 1px solid #e6e6e6; | ||
| 129 | - padding-left: 20px; | ||
| 130 | - | ||
| 131 | - &.highlight { | ||
| 132 | - background: #eee; | ||
| 133 | - } | ||
| 134 | - | ||
| 135 | - &:last-child { | ||
| 136 | - border-bottom: none; | ||
| 137 | - } | ||
| 138 | - } | ||
| 139 | - | ||
| 140 | - a { | ||
| 141 | - display: block; | ||
| 142 | - height: 100%; | ||
| 143 | - width: 100%; | ||
| 144 | - color: #afafaf; | ||
| 145 | - } | ||
| 146 | - } | ||
| 147 | -} |
| @@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
| 27 | &:link, | 27 | &:link, |
| 28 | &:visited, | 28 | &:visited, |
| 29 | &:hover, | 29 | &:hover, |
| 30 | - &:actived { | 30 | + &:active { |
| 31 | color: #000; | 31 | color: #000; |
| 32 | } | 32 | } |
| 33 | } | 33 | } |
| @@ -681,7 +681,6 @@ | @@ -681,7 +681,6 @@ | ||
| 681 | font-size: 24px; | 681 | font-size: 24px; |
| 682 | text-align: center; | 682 | text-align: center; |
| 683 | line-height: 50px; | 683 | line-height: 50px; |
| 684 | - /*display: none;*/ | ||
| 685 | } | 684 | } |
| 686 | } | 685 | } |
| 687 | 686 | ||
| @@ -808,7 +807,6 @@ | @@ -808,7 +807,6 @@ | ||
| 808 | 807 | ||
| 809 | .forward { | 808 | .forward { |
| 810 | width: 40px; | 809 | width: 40px; |
| 811 | - height: 28px; | ||
| 812 | position: absolute; | 810 | position: absolute; |
| 813 | right: 23px; | 811 | right: 23px; |
| 814 | margin-left: 45px; | 812 | margin-left: 45px; |
| @@ -1035,4 +1033,4 @@ | @@ -1035,4 +1033,4 @@ | ||
| 1035 | } | 1033 | } |
| 1036 | } | 1034 | } |
| 1037 | } | 1035 | } |
| 1038 | -} | ||
| 1036 | +} |
| @@ -9,32 +9,32 @@ | @@ -9,32 +9,32 @@ | ||
| 9 | border-bottom: 1px solid #e0e0e0; | 9 | border-bottom: 1px solid #e0e0e0; |
| 10 | color: #b0b0b0; | 10 | color: #b0b0b0; |
| 11 | font-size: 26px; | 11 | font-size: 26px; |
| 12 | + } | ||
| 12 | 13 | ||
| 13 | - li { | ||
| 14 | - width: 50%; | ||
| 15 | - height: 100%; | ||
| 16 | - float: left; | ||
| 17 | - text-align: center; | 14 | + .fav-tab > li { |
| 15 | + width: 50%; | ||
| 16 | + height: 100%; | ||
| 17 | + float: left; | ||
| 18 | + text-align: center; | ||
| 18 | 19 | ||
| 19 | - &.active { | ||
| 20 | - color: #444; | ||
| 21 | - } | 20 | + &.active { |
| 21 | + color: #444; | ||
| 22 | + } | ||
| 22 | 23 | ||
| 23 | - &:nth-last-of-type(1) { | ||
| 24 | - float: right; | ||
| 25 | - position: relative; | ||
| 26 | - | ||
| 27 | - &:after { | ||
| 28 | - content: ""; | ||
| 29 | - display: block; | ||
| 30 | - width: 1px; | ||
| 31 | - height: 44px; | ||
| 32 | - position: absolute; | ||
| 33 | - left: 0; | ||
| 34 | - top: 22px; | ||
| 35 | - background: #b0b0b0; | ||
| 36 | - } | ||
| 37 | - } | 24 | + &:nth-last-of-type(1) { |
| 25 | + float: right; | ||
| 26 | + position: relative; | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | + &:nth-last-of-type(1):after { | ||
| 30 | + content: ""; | ||
| 31 | + display: block; | ||
| 32 | + width: 1px; | ||
| 33 | + height: 44px; | ||
| 34 | + position: absolute; | ||
| 35 | + left: 0; | ||
| 36 | + top: 22px; | ||
| 37 | + background: #b0b0b0; | ||
| 38 | } | 38 | } |
| 39 | } | 39 | } |
| 40 | 40 | ||
| @@ -47,24 +47,6 @@ | @@ -47,24 +47,6 @@ | ||
| 47 | display: block; | 47 | display: block; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | - .fav-null { | ||
| 51 | - font-size: 22px; | ||
| 52 | - color: #444; | ||
| 53 | - display: block; | ||
| 54 | - margin-top: 100px; | ||
| 55 | - text-align: center; | ||
| 56 | - | ||
| 57 | - &:before { | ||
| 58 | - content: ""; | ||
| 59 | - display: block; | ||
| 60 | - width: 188px; | ||
| 61 | - height: 171px; | ||
| 62 | - background: resolve("home/fav/fav-null.png"); | ||
| 63 | - background-size: 100% 100%; | ||
| 64 | - margin: 0 auto 45px; | ||
| 65 | - } | ||
| 66 | - } | ||
| 67 | - | ||
| 68 | .go-shopping { | 50 | .go-shopping { |
| 69 | width: 472px; | 51 | width: 472px; |
| 70 | height: 88px; | 52 | height: 88px; |
| @@ -77,252 +59,264 @@ | @@ -77,252 +59,264 @@ | ||
| 77 | font-size: 26px; | 59 | font-size: 26px; |
| 78 | border-radius: 0.2rem; | 60 | border-radius: 0.2rem; |
| 79 | } | 61 | } |
| 62 | + } | ||
| 80 | 63 | ||
| 81 | - .fav-product-list { | ||
| 82 | - list-style: none; | ||
| 83 | - margin-left: 30px; | 64 | + .fav-content .fav-null { |
| 65 | + font-size: 22px; | ||
| 66 | + color: #444; | ||
| 67 | + display: block; | ||
| 68 | + margin-top: 100px; | ||
| 69 | + text-align: center; | ||
| 84 | 70 | ||
| 85 | - li { | ||
| 86 | - height: auto; | ||
| 87 | - overflow: hidden; | ||
| 88 | - margin-top: 20px; | ||
| 89 | - } | 71 | + &:before { |
| 72 | + content: ""; | ||
| 73 | + display: block; | ||
| 74 | + width: 188px; | ||
| 75 | + height: 171px; | ||
| 76 | + background: resolve("home/fav/fav-null.png"); | ||
| 77 | + background-size: 100% 100%; | ||
| 78 | + margin: 0 auto 45px; | ||
| 79 | + } | ||
| 80 | + } | ||
| 90 | 81 | ||
| 91 | - .fav-img-box { | ||
| 92 | - width: 90px; | ||
| 93 | - height: 120px; | ||
| 94 | - float: left; | ||
| 95 | - margin-right: 24px; | ||
| 96 | - | ||
| 97 | - img { | ||
| 98 | - display: block; | ||
| 99 | - overflow: hidden; | ||
| 100 | - width: 100%; | ||
| 101 | - height: 100%; | ||
| 102 | - } | ||
| 103 | - } | 82 | + .fav-content .fav-product-list { |
| 83 | + list-style: none; | ||
| 84 | + margin-left: 30px; | ||
| 104 | 85 | ||
| 105 | - .fav-info-list { | ||
| 106 | - color: #444; | ||
| 107 | - font-size: 24px; | ||
| 108 | - border-bottom: 1px solid #e0e0e0; | ||
| 109 | - padding-bottom: 20px; | ||
| 110 | - height: 140px; | ||
| 111 | - overflow: hidden; | ||
| 112 | - position: relative; | 86 | + li { |
| 87 | + height: auto; | ||
| 88 | + overflow: hidden; | ||
| 89 | + margin-top: 20px; | ||
| 90 | + } | ||
| 113 | 91 | ||
| 114 | - h2 { | ||
| 115 | - width: 430px; | ||
| 116 | - text-overflow: ellipsis; | ||
| 117 | - } | 92 | + .fav-img-box { |
| 93 | + width: 90px; | ||
| 94 | + height: 120px; | ||
| 95 | + float: left; | ||
| 96 | + margin-right: 24px; | ||
| 97 | + } | ||
| 118 | 98 | ||
| 119 | - .fav-price { | ||
| 120 | - .new-price { | ||
| 121 | - color: #d1021c; | ||
| 122 | - } | 99 | + .fav-img-box img { |
| 100 | + display: block; | ||
| 101 | + overflow: hidden; | ||
| 102 | + width: 100%; | ||
| 103 | + height: 100%; | ||
| 104 | + } | ||
| 123 | 105 | ||
| 124 | - .price-underline { | ||
| 125 | - text-decoration: line-through; | ||
| 126 | - margin-left: 15px; | ||
| 127 | - color: #b0b0b0; | ||
| 128 | - } | ||
| 129 | - } | 106 | + .fav-info-list { |
| 107 | + color: #444; | ||
| 108 | + font-size: 24px; | ||
| 109 | + border-bottom: 1px solid #e0e0e0; | ||
| 110 | + padding-bottom: 20px; | ||
| 111 | + height: 140px; | ||
| 112 | + overflow: hidden; | ||
| 113 | + position: relative; | ||
| 114 | + } | ||
| 130 | 115 | ||
| 131 | - .save-price { | ||
| 132 | - position: absolute; | ||
| 133 | - bottom: 20px; | ||
| 134 | - left: 0; | ||
| 135 | - width: 100%; | ||
| 136 | - min-height: 24px; | ||
| 137 | - | ||
| 138 | - &.save-price-number { | ||
| 139 | - text-indent: 42px; | ||
| 140 | - color: #b0b0b0; | ||
| 141 | - padding-top: 3px; | ||
| 142 | - | ||
| 143 | - &:before { | ||
| 144 | - content: ""; | ||
| 145 | - display: block; | ||
| 146 | - background: url("/home/fav/save-price.png"); | ||
| 147 | - width: 32px; | ||
| 148 | - height: 32px; | ||
| 149 | - position: absolute; | ||
| 150 | - top: 50%; | ||
| 151 | - left: 0; | ||
| 152 | - margin-top: -16px; | ||
| 153 | - } | ||
| 154 | - | ||
| 155 | - span { | ||
| 156 | - margin-left: 15px; | ||
| 157 | - } | ||
| 158 | - | ||
| 159 | - .del-fav { | ||
| 160 | - text-indent: 0; | ||
| 161 | - margin-left: 0; | ||
| 162 | - } | ||
| 163 | - } | ||
| 164 | - | ||
| 165 | - span { | ||
| 166 | - color: #d1021c; | ||
| 167 | - | ||
| 168 | - &.sell-out { | ||
| 169 | - padding: 5px 18px; | ||
| 170 | - color: #fffefe; | ||
| 171 | - border-radius: 20px; | ||
| 172 | - background: #7f7f7f; | ||
| 173 | - font-size: 22px; | ||
| 174 | - } | ||
| 175 | - | ||
| 176 | - &.del-fav { | ||
| 177 | - width: 2rem; | ||
| 178 | - height: 1.5rem; | ||
| 179 | - line-height: 1.5rem; | ||
| 180 | - position: absolute; | ||
| 181 | - top: 50%; | ||
| 182 | - margin-top: -0.75rem; | ||
| 183 | - right: 0; | ||
| 184 | - color: #999; | ||
| 185 | - padding-right: 0.75rem; | ||
| 186 | - text-align: right; | ||
| 187 | - } | ||
| 188 | - } | ||
| 189 | - } | ||
| 190 | - } | 116 | + .fav-info-list h2 { |
| 117 | + width: 430px; | ||
| 118 | + text-overflow: ellipsis; | ||
| 119 | + } | ||
| 120 | + | ||
| 121 | + .fav-info-list .fav-price .new-price { | ||
| 122 | + color: #d1021c; | ||
| 191 | } | 123 | } |
| 192 | 124 | ||
| 193 | - /*品牌收藏*/ | 125 | + .fav-info-list .fav-price .price-underline { |
| 126 | + text-decoration: line-through; | ||
| 127 | + margin-left: 15px; | ||
| 128 | + color: #b0b0b0; | ||
| 129 | + } | ||
| 130 | + | ||
| 131 | + .fav-info-list .save-price { | ||
| 132 | + position: absolute; | ||
| 133 | + bottom: 20px; | ||
| 134 | + left: 0; | ||
| 135 | + width: 100%; | ||
| 136 | + min-height: 24px; | ||
| 137 | + } | ||
| 138 | + | ||
| 139 | + .fav-info-list .save-price span { | ||
| 140 | + color: #d1021c; | ||
| 141 | + } | ||
| 142 | + | ||
| 143 | + .fav-info-list .save-price .sell-out { | ||
| 144 | + padding: 5px 18px; | ||
| 145 | + color: #fffefe; | ||
| 146 | + border-radius: 20px; | ||
| 147 | + background: #7f7f7f; | ||
| 148 | + font-size: 22px; | ||
| 149 | + } | ||
| 194 | 150 | ||
| 195 | - .fav-brand-swiper { | 151 | + .fav-info-list .save-price .del-fav { |
| 152 | + width: 2rem; | ||
| 153 | + height: 1.5rem; | ||
| 154 | + line-height: 1.5rem; | ||
| 155 | + position: absolute; | ||
| 156 | + top: 50%; | ||
| 157 | + margin-top: -0.75rem; | ||
| 158 | + right: 0; | ||
| 159 | + color: #999; | ||
| 160 | + padding-right: 0.75rem; | ||
| 161 | + text-align: right; | ||
| 162 | + } | ||
| 163 | + | ||
| 164 | + .fav-info-list .save-price-number { | ||
| 165 | + text-indent: 42px; | ||
| 166 | + color: #b0b0b0; | ||
| 167 | + padding-top: 3px; | ||
| 168 | + } | ||
| 169 | + | ||
| 170 | + .fav-info-list .save-price-number:before { | ||
| 171 | + content: ""; | ||
| 172 | + display: block; | ||
| 173 | + background: url("/home/fav/save-price.png"); | ||
| 174 | + width: 32px; | ||
| 175 | + height: 32px; | ||
| 176 | + position: absolute; | ||
| 177 | + top: 50%; | ||
| 178 | + left: 0; | ||
| 179 | + margin-top: -16px; | ||
| 180 | + } | ||
| 181 | + | ||
| 182 | + .fav-info-list .save-price-number span { | ||
| 183 | + margin-left: 15px; | ||
| 184 | + } | ||
| 185 | + | ||
| 186 | + .fav-info-list .save-price-number .del-fav { | ||
| 187 | + text-indent: 0; | ||
| 188 | + margin-left: 0; | ||
| 189 | + } | ||
| 190 | + } | ||
| 191 | + | ||
| 192 | + .fav-content .fav-brand-swiper { | ||
| 193 | + border-top: 1px solid #e0e0e0; | ||
| 194 | + border-bottom: 28px solid #f0f0f0; | ||
| 195 | + position: relative; | ||
| 196 | + | ||
| 197 | + &:nth-of-type(1) { | ||
| 198 | + border-top: 0; | ||
| 199 | + } | ||
| 200 | + | ||
| 201 | + &:after { | ||
| 202 | + content: ""; | ||
| 203 | + position: absolute; | ||
| 204 | + left: 0; | ||
| 205 | + bottom: -2px; | ||
| 196 | border-top: 1px solid #e0e0e0; | 206 | border-top: 1px solid #e0e0e0; |
| 197 | - border-bottom: 28px solid #f0f0f0; | ||
| 198 | - position: relative; | 207 | + display: block; |
| 208 | + width: 100%; | ||
| 209 | + height: 1px; | ||
| 210 | + } | ||
| 211 | + } | ||
| 199 | 212 | ||
| 200 | - &:nth-of-type(1) { | ||
| 201 | - border-top: 0; | ||
| 202 | - } | 213 | + .fav-content .fav-brand-swiper .swiper-header { |
| 214 | + height: 100px; | ||
| 215 | + padding: 20px 30px; | ||
| 216 | + display: inline-block; | ||
| 217 | + position: relative; | ||
| 218 | + width: 100%; | ||
| 219 | + box-sizing: border-box; | ||
| 203 | 220 | ||
| 204 | - &:after { | ||
| 205 | - content: ""; | ||
| 206 | - position: absolute; | ||
| 207 | - left: 0; | ||
| 208 | - bottom: -2px; | ||
| 209 | - border-top: 1px solid #e0e0e0; | ||
| 210 | - display: block; | ||
| 211 | - width: 100%; | ||
| 212 | - height: 1px; | 221 | + .swiper-logo { |
| 222 | + height: 100%; | ||
| 223 | + display: inline-block; | ||
| 224 | + float: left; | ||
| 225 | + margin-right: 45px; | ||
| 226 | + } | ||
| 227 | + | ||
| 228 | + .swiper-logo > img { | ||
| 229 | + max-height: 100%; | ||
| 230 | + vertical-align: middle; | ||
| 231 | + } | ||
| 232 | + | ||
| 233 | + .brand-info { | ||
| 234 | + float: left; | ||
| 235 | + | ||
| 236 | + .brand-name { | ||
| 237 | + font-size: 28px; | ||
| 238 | + | ||
| 239 | + b { | ||
| 240 | + color: #b0b0b0; | ||
| 241 | + font-weight: normal; | ||
| 242 | + } | ||
| 213 | } | 243 | } |
| 214 | 244 | ||
| 215 | - .swiper-header { | ||
| 216 | - height: 100px; | ||
| 217 | - padding: 20px 30px; | ||
| 218 | - display: inline-block; | ||
| 219 | - position: relative; | ||
| 220 | - width: 100%; | ||
| 221 | - box-sizing: border-box; | ||
| 222 | - | ||
| 223 | - .swiper-logo { | ||
| 224 | - height: 100%; | ||
| 225 | - display: inline-block; | ||
| 226 | - float: left; | ||
| 227 | - margin-right: 45px; | ||
| 228 | - | ||
| 229 | - > img { | ||
| 230 | - max-height: 100%; | ||
| 231 | - vertical-align: middle; | ||
| 232 | - } | 245 | + .brand-update { |
| 246 | + font-size: 22px; | ||
| 247 | + | ||
| 248 | + b { | ||
| 249 | + color: #b0b0b0; | ||
| 250 | + font-weight: normal; | ||
| 233 | } | 251 | } |
| 234 | 252 | ||
| 235 | - .brand-info { | ||
| 236 | - float: left; | 253 | + .brand-new { |
| 254 | + color: #86bf4a; | ||
| 255 | + margin-right: 24px; | ||
| 256 | + } | ||
| 237 | 257 | ||
| 238 | - .brand-name { | ||
| 239 | - font-size: 28px; | 258 | + .brand-discount { |
| 259 | + color: #d1021c; | ||
| 260 | + } | ||
| 261 | + } | ||
| 262 | + } | ||
| 263 | + | ||
| 264 | + .fav-more { | ||
| 265 | + width: 2.5rem; | ||
| 266 | + height: 2.5rem; | ||
| 267 | + position: absolute; | ||
| 268 | + top: 0; | ||
| 269 | + right: 0; | ||
| 270 | + | ||
| 271 | + &:after { | ||
| 272 | + background: url("/home/fav/fav-more.png"); | ||
| 273 | + width: 18px; | ||
| 274 | + height: 29px; | ||
| 275 | + position: absolute; | ||
| 276 | + top: 50%; | ||
| 277 | + right: 30px; | ||
| 278 | + margin-top: -15px; | ||
| 279 | + content: ""; | ||
| 280 | + } | ||
| 281 | + } | ||
| 282 | + } | ||
| 240 | 283 | ||
| 241 | - b { | ||
| 242 | - color: #b0b0b0; | ||
| 243 | - font-weight: normal; | ||
| 244 | - } | ||
| 245 | - } | 284 | + .fav-content .fav-brand-swiper .swiper-container { |
| 285 | + height: 365px; | ||
| 286 | + margin: 0 30px; | ||
| 246 | 287 | ||
| 247 | - .brand-update { | ||
| 248 | - font-size: 22px; | 288 | + .swiper-slide { |
| 289 | + width: 255px; | ||
| 290 | + height: 100%; | ||
| 291 | + float: left; | ||
| 292 | + padding-right: 30px; | ||
| 249 | 293 | ||
| 250 | - b { | ||
| 251 | - color: #b0b0b0; | ||
| 252 | - font-weight: normal; | ||
| 253 | - } | 294 | + &:nth-last-of-type(1) { |
| 295 | + padding-right: 0; | ||
| 296 | + } | ||
| 254 | 297 | ||
| 255 | - .brand-new { | ||
| 256 | - color: #86bf4a; | ||
| 257 | - margin-right: 24px; | ||
| 258 | - } | 298 | + img { |
| 299 | + display: block; | ||
| 300 | + width: 100%; | ||
| 301 | + height: 300px; | ||
| 302 | + overflow: hidden; | ||
| 303 | + } | ||
| 259 | 304 | ||
| 260 | - .brand-discount { | ||
| 261 | - color: #d1021c; | ||
| 262 | - } | ||
| 263 | - } | ||
| 264 | - } | 305 | + .brand-product { |
| 306 | + height: 65px; | ||
| 307 | + line-height: 65px; | ||
| 308 | + text-align: center; | ||
| 309 | + font-size: 22px; | ||
| 265 | 310 | ||
| 266 | - .fav-more { | ||
| 267 | - width: 2.5rem; | ||
| 268 | - height: 2.5rem; | ||
| 269 | - position: absolute; | ||
| 270 | - top: 0; | ||
| 271 | - right: 0; | ||
| 272 | - | ||
| 273 | - &:after { | ||
| 274 | - background: url("/home/fav/fav-more.png"); | ||
| 275 | - width: 18px; | ||
| 276 | - height: 29px; | ||
| 277 | - position: absolute; | ||
| 278 | - top: 50%; | ||
| 279 | - right: 30px; | ||
| 280 | - margin-top: -15px; | ||
| 281 | - content: ""; | ||
| 282 | - } | 311 | + .price-discount span { |
| 312 | + color: #d1021c; | ||
| 283 | } | 313 | } |
| 284 | - } | ||
| 285 | 314 | ||
| 286 | - .swiper-container { | ||
| 287 | - height: 365px; | ||
| 288 | - margin: 0 30px; | ||
| 289 | - | ||
| 290 | - .swiper-slide { | ||
| 291 | - width: 255px; | ||
| 292 | - height: 100%; | ||
| 293 | - float: left; | ||
| 294 | - padding-right: 30px; | ||
| 295 | - | ||
| 296 | - &:nth-last-of-type(1) { | ||
| 297 | - padding-right: 0; | ||
| 298 | - } | ||
| 299 | - | ||
| 300 | - img { | ||
| 301 | - display: block; | ||
| 302 | - width: 100%; | ||
| 303 | - height: 300px; | ||
| 304 | - overflow: hidden; | ||
| 305 | - } | ||
| 306 | - | ||
| 307 | - .brand-product { | ||
| 308 | - height: 65px; | ||
| 309 | - line-height: 65px; | ||
| 310 | - text-align: center; | ||
| 311 | - font-size: 22px; | ||
| 312 | - | ||
| 313 | - .price-discount { | ||
| 314 | - span { | ||
| 315 | - color: #d1021c; | ||
| 316 | - } | ||
| 317 | - | ||
| 318 | - b { | ||
| 319 | - color: #b0b0b0; | ||
| 320 | - text-decoration: line-through; | ||
| 321 | - font-weight: normal; | ||
| 322 | - margin-left: 13px; | ||
| 323 | - } | ||
| 324 | - } | ||
| 325 | - } | 315 | + .price-discount b { |
| 316 | + color: #b0b0b0; | ||
| 317 | + text-decoration: line-through; | ||
| 318 | + font-weight: normal; | ||
| 319 | + margin-left: 13px; | ||
| 326 | } | 320 | } |
| 327 | } | 321 | } |
| 328 | } | 322 | } |
| @@ -30,38 +30,38 @@ | @@ -30,38 +30,38 @@ | ||
| 30 | 30 | ||
| 31 | .ticket-btn { | 31 | .ticket-btn { |
| 32 | width: 580px; | 32 | width: 580px; |
| 33 | + } | ||
| 33 | 34 | ||
| 34 | - .ticket-btn-c { | ||
| 35 | - width: 420px; | ||
| 36 | - border-top: solid 1px #e0e0e0; | ||
| 37 | - clear: both; | ||
| 38 | - margin: 55px auto 0; | 35 | + .ticket-btn .ticket-btn-c { |
| 36 | + width: 420px; | ||
| 37 | + border-top: solid 1px #e0e0e0; | ||
| 38 | + clear: both; | ||
| 39 | + margin: 55px auto 0; | ||
| 40 | + | ||
| 41 | + div { | ||
| 42 | + width: 200px; | ||
| 43 | + margin: -25px auto 0; | ||
| 44 | + height: 54px; | ||
| 45 | + background-color: #fff; | ||
| 46 | + | ||
| 47 | + a { | ||
| 48 | + width: 152px; | ||
| 49 | + height: 50px; | ||
| 50 | + border: solid 2px #d0021b; | ||
| 51 | + color: #fff; | ||
| 52 | + font-size: 24px; | ||
| 53 | + display: block; | ||
| 54 | + text-align: center; | ||
| 55 | + line-height: 50px; | ||
| 56 | + border-radius: 25px; | ||
| 57 | + margin: 0 auto; | ||
| 58 | + background-color: #d0021b; | ||
| 59 | + } | ||
| 39 | 60 | ||
| 40 | - div { | ||
| 41 | - width: 200px; | ||
| 42 | - margin: -25px auto 0; | ||
| 43 | - height: 54px; | ||
| 44 | - background-color: #fff; | ||
| 45 | - | ||
| 46 | - a { | ||
| 47 | - width: 152px; | ||
| 48 | - height: 50px; | ||
| 49 | - border: solid 2px #d0021b; | ||
| 50 | - color: #fff; | ||
| 51 | - font-size: 24px; | ||
| 52 | - display: block; | ||
| 53 | - text-align: center; | ||
| 54 | - line-height: 50px; | ||
| 55 | - border-radius: 25px; | ||
| 56 | - margin: 0 auto; | ||
| 57 | - background-color: #d0021b; | ||
| 58 | - } | ||
| 59 | - | ||
| 60 | - .disable { | ||
| 61 | - background-color: #b0b0b0; | ||
| 62 | - color: #fff; | ||
| 63 | - border-color: #b0b0b0; | ||
| 64 | - } | 61 | + .disable { |
| 62 | + background-color: #b0b0b0; | ||
| 63 | + color: #fff; | ||
| 64 | + border-color: #b0b0b0; | ||
| 65 | } | 65 | } |
| 66 | } | 66 | } |
| 67 | } | 67 | } |
| @@ -174,65 +174,65 @@ | @@ -174,65 +174,65 @@ | ||
| 174 | 174 | ||
| 175 | .ticket-list { | 175 | .ticket-list { |
| 176 | padding-top: 30px; | 176 | padding-top: 30px; |
| 177 | + } | ||
| 177 | 178 | ||
| 178 | - .ticket { | ||
| 179 | - margin-bottom: 30px; | ||
| 180 | - width: 580px; | 179 | + .ticket-list .ticket { |
| 180 | + margin-bottom: 30px; | ||
| 181 | + width: 580px; | ||
| 182 | + height: 168px; | ||
| 183 | + background-image: resolve("home/employ/employ2.png"); | ||
| 184 | + background-position: top center; | ||
| 185 | + background-repeat: no-repeat; | ||
| 186 | + background-size: 100% 100%; | ||
| 187 | + | ||
| 188 | + .left { | ||
| 189 | + width: 200px; | ||
| 181 | height: 168px; | 190 | height: 168px; |
| 182 | - background-image: resolve("home/employ/employ2.png"); | ||
| 183 | - background-position: top center; | ||
| 184 | - background-repeat: no-repeat; | ||
| 185 | - background-size: 100% 100%; | ||
| 186 | - | ||
| 187 | - .left { | ||
| 188 | - width: 200px; | ||
| 189 | - height: 168px; | ||
| 190 | - color: #fff; | ||
| 191 | - font-size: 90px; | ||
| 192 | - line-height: 168px; | ||
| 193 | - text-align: center; | ||
| 194 | - float: left; | ||
| 195 | - overflow: hidden; | 191 | + color: #fff; |
| 192 | + font-size: 90px; | ||
| 193 | + line-height: 168px; | ||
| 194 | + text-align: center; | ||
| 195 | + float: left; | ||
| 196 | + overflow: hidden; | ||
| 196 | 197 | ||
| 197 | - span { | ||
| 198 | - float: left; | ||
| 199 | - margin-left: 10px; | ||
| 200 | - font-size: 50px; | ||
| 201 | - } | 198 | + span { |
| 199 | + float: left; | ||
| 200 | + margin-left: 10px; | ||
| 201 | + font-size: 50px; | ||
| 202 | + } | ||
| 202 | 203 | ||
| 203 | - div { | ||
| 204 | - overflow: hidden; | ||
| 205 | - } | 204 | + div { |
| 205 | + overflow: hidden; | ||
| 206 | } | 206 | } |
| 207 | + } | ||
| 207 | 208 | ||
| 208 | - .right { | ||
| 209 | - width: 270px; | ||
| 210 | - padding: 30px 0; | ||
| 211 | - height: 168px; | ||
| 212 | - float: left; | 209 | + .right { |
| 210 | + width: 270px; | ||
| 211 | + padding: 30px 0; | ||
| 212 | + height: 168px; | ||
| 213 | + float: left; | ||
| 213 | 214 | ||
| 214 | - .first { | ||
| 215 | - width: 240px; | ||
| 216 | - overflow: hidden; | ||
| 217 | - font-size: 26px; | ||
| 218 | - line-height: 40px; | ||
| 219 | - height: 80px; | ||
| 220 | - } | ||
| 221 | - | ||
| 222 | - p { | ||
| 223 | - font-size: 18px; | ||
| 224 | - color: #fff; | ||
| 225 | - line-height: 30px; | ||
| 226 | - } | 215 | + .first { |
| 216 | + width: 240px; | ||
| 217 | + overflow: hidden; | ||
| 218 | + font-size: 26px; | ||
| 219 | + line-height: 40px; | ||
| 220 | + height: 80px; | ||
| 227 | } | 221 | } |
| 228 | 222 | ||
| 229 | - .btn { | ||
| 230 | - width: 110px; | ||
| 231 | - height: 168px; | ||
| 232 | - float: left; | ||
| 233 | - display: block; | 223 | + p { |
| 224 | + font-size: 18px; | ||
| 225 | + color: #fff; | ||
| 226 | + line-height: 30px; | ||
| 234 | } | 227 | } |
| 235 | } | 228 | } |
| 229 | + | ||
| 230 | + .btn { | ||
| 231 | + width: 110px; | ||
| 232 | + height: 168px; | ||
| 233 | + float: left; | ||
| 234 | + display: block; | ||
| 235 | + } | ||
| 236 | } | 236 | } |
| 237 | } | 237 | } |
| 238 | } | 238 | } |
| @@ -304,7 +304,6 @@ | @@ -304,7 +304,6 @@ | ||
| 304 | .name { | 304 | .name { |
| 305 | font-size: 28px; | 305 | font-size: 28px; |
| 306 | max-width: 70%; | 306 | max-width: 70%; |
| 307 | - text-overflow: -o-ellipsis-lastline; | ||
| 308 | overflow: hidden; | 307 | overflow: hidden; |
| 309 | text-overflow: ellipsis; | 308 | text-overflow: ellipsis; |
| 310 | display: -webkit-box; | 309 | display: -webkit-box; |
| @@ -17,6 +17,7 @@ | @@ -17,6 +17,7 @@ | ||
| 17 | height: 100px; | 17 | height: 100px; |
| 18 | line-height: 100px; | 18 | line-height: 100px; |
| 19 | } | 19 | } |
| 20 | + | ||
| 20 | height: 80px; | 21 | height: 80px; |
| 21 | border-bottom: 1px solid #e0e0e0; | 22 | border-bottom: 1px solid #e0e0e0; |
| 22 | 23 | ||
| @@ -31,6 +32,7 @@ | @@ -31,6 +32,7 @@ | ||
| 31 | &:first-of-type { | 32 | &:first-of-type { |
| 32 | color: #444; | 33 | color: #444; |
| 33 | } | 34 | } |
| 35 | + | ||
| 34 | width: 42%; | 36 | width: 42%; |
| 35 | height: 100%; | 37 | height: 100%; |
| 36 | line-height: 80px; | 38 | line-height: 80px; |
| @@ -56,21 +58,21 @@ | @@ -56,21 +58,21 @@ | ||
| 56 | overflow: hidden; | 58 | overflow: hidden; |
| 57 | display: block; | 59 | display: block; |
| 58 | position: relative; | 60 | position: relative; |
| 61 | + } | ||
| 59 | 62 | ||
| 60 | - i { | ||
| 61 | - width: 72px; | ||
| 62 | - height: 32px; | ||
| 63 | - overflow: hidden; | ||
| 64 | - display: block; | ||
| 65 | - position: absolute; | ||
| 66 | - right: 40px; | ||
| 67 | - top: 50%; | ||
| 68 | - transform: translateY(-50%); | ||
| 69 | - } | 63 | + .grade i { |
| 64 | + width: 72px; | ||
| 65 | + height: 32px; | ||
| 66 | + overflow: hidden; | ||
| 67 | + display: block; | ||
| 68 | + position: absolute; | ||
| 69 | + right: 40px; | ||
| 70 | + top: 50%; | ||
| 71 | + transform: translateY(-50%); | ||
| 72 | + } | ||
| 70 | 73 | ||
| 71 | - span { | ||
| 72 | - color: #b0b0b0; | ||
| 73 | - } | 74 | + .grade span { |
| 75 | + color: #b0b0b0; | ||
| 74 | } | 76 | } |
| 75 | 77 | ||
| 76 | .vip-3 { | 78 | .vip-3 { |
| 1 | -.my-coupon-page { | ||
| 2 | - .coupon-tab { | ||
| 3 | - height: 90px; | ||
| 4 | - padding: 25px 0; | ||
| 5 | - text-align: center; | ||
| 6 | - background-color: #fff; | ||
| 7 | - font-size: 32px; | ||
| 8 | - color: #b0b0b0; | ||
| 9 | - | ||
| 10 | - ul li { | ||
| 11 | - float: left; | ||
| 12 | - width: 50%; | ||
| 13 | - border-right: 1px solid #b0b0b0; | ||
| 14 | - | ||
| 15 | - &.activate { | ||
| 16 | - color: #444; | ||
| 17 | - } | ||
| 18 | - | ||
| 19 | - &:last-child { | ||
| 20 | - border: none; | ||
| 21 | - } | ||
| 22 | - } | ||
| 23 | - } | ||
| 24 | - | ||
| 25 | - .coupon-group { | ||
| 26 | - background-color: #f2f2f2; | ||
| 27 | - color: #f2f2f2; | ||
| 28 | - margin: 20px 20px 0; | ||
| 29 | - | ||
| 30 | - & > div { | ||
| 31 | - padding: 0 15px; | ||
| 32 | - } | ||
| 33 | - | ||
| 34 | - .coupon-header { | ||
| 35 | - border-radius: 10px 10px 0 0; | ||
| 36 | - background-color: #e53333; | ||
| 37 | - height: 60px; | ||
| 38 | - line-height: 60px; | ||
| 39 | - overflow: hidden; | ||
| 40 | - text-overflow: ellipsis; | ||
| 41 | - white-space: nowrap; | ||
| 42 | - font-size: 28px; | ||
| 43 | - } | ||
| 44 | - | ||
| 45 | - .coupon-content { | ||
| 46 | - border-radius: 0 0 10px 10px; | ||
| 47 | - height: 140px; | ||
| 48 | - border-top: 2px dashed #e53333; | ||
| 49 | - display: table; | ||
| 50 | - padding: 15px 0; | ||
| 51 | - background-color: #f06a6b; | ||
| 52 | - | ||
| 53 | - .coupon-content-group1 { | ||
| 54 | - display: table-cell; | ||
| 55 | - text-align: center; | ||
| 56 | - vertical-align: middle; | ||
| 57 | - font-size: 20px; | ||
| 58 | - | ||
| 59 | - p { | ||
| 60 | - width: 200px; | ||
| 61 | - overflow: hidden; | ||
| 62 | - min-height: 28px; | ||
| 63 | - } | ||
| 64 | - | ||
| 65 | - .coupon-money { | ||
| 66 | - font-size: 80px; | ||
| 67 | - } | ||
| 68 | - } | ||
| 69 | - | ||
| 70 | - .coupon-content-group2 { | ||
| 71 | - display: table-cell; | ||
| 72 | - font-size: 20px; | ||
| 73 | - border-left: 1px solid #f1aeaf; | ||
| 74 | - padding-left: 20px; | ||
| 75 | - padding-right: 20px; | ||
| 76 | - width: 100%; | ||
| 77 | - | ||
| 78 | - .coupon-content-group2-table { | ||
| 79 | - display: table; | ||
| 80 | - overflow: hidden; | ||
| 81 | - height: 100%; | ||
| 82 | - width: 100%; | ||
| 83 | - line-height: 45px; | ||
| 84 | - } | ||
| 85 | - | ||
| 86 | - .coupon-content-group2-table > div { | ||
| 87 | - display: table-row; | ||
| 88 | - height: 100%; | ||
| 89 | - } | ||
| 90 | - | ||
| 91 | - .left { | ||
| 92 | - float: left; | ||
| 93 | - line-height: 45px; | ||
| 94 | - color: #fff; | ||
| 95 | - } | ||
| 96 | - | ||
| 97 | - .left.down .iconfont:before { | ||
| 98 | - font-size: 12px; | ||
| 99 | - content: "\e609"; | ||
| 100 | - } | ||
| 101 | - | ||
| 102 | - .left.up .iconfont:before { | ||
| 103 | - font-size: 12px; | ||
| 104 | - content: "\e608"; | ||
| 105 | - } | ||
| 106 | - | ||
| 107 | - .right { | ||
| 108 | - float: right; | ||
| 109 | - } | ||
| 110 | - | ||
| 111 | - .coupon-soon-expire { | ||
| 112 | - color: #000; | ||
| 113 | - } | ||
| 114 | - | ||
| 115 | - .btn { | ||
| 116 | - display: inline-block; | ||
| 117 | - width: 120px; | ||
| 118 | - height: 45px; | ||
| 119 | - text-align: center; | ||
| 120 | - background-color: #e53333; | ||
| 121 | - border-radius: 10px; | ||
| 122 | - color: #fff; | ||
| 123 | - } | ||
| 124 | - | ||
| 125 | - .employ { | ||
| 126 | - width: 171px; | ||
| 127 | - height: 146px; | ||
| 128 | - position: absolute; | ||
| 129 | - display: block; | ||
| 130 | - z-index: 2; | ||
| 131 | - right: 37px; | ||
| 132 | - margin-top: -95px; | ||
| 133 | - background-image: resolve("home/employ.png"); | ||
| 134 | - background-size: cover; | ||
| 135 | - } | ||
| 136 | - } | ||
| 137 | - } | ||
| 138 | - | ||
| 139 | - .coupon-footer { | ||
| 140 | - background-color: #f06a6b; | ||
| 141 | - padding: 20px; | ||
| 142 | - font-size: 18px; | ||
| 143 | - border-radius: 10px; | ||
| 144 | - color: #fff; | ||
| 145 | - border-top: 1px dashed #fff; | ||
| 146 | - } | ||
| 147 | - } | ||
| 148 | - | ||
| 149 | - .coupon-not-result { | ||
| 150 | - width: 100%; | ||
| 151 | - height: auto; | ||
| 152 | - overflow: hidden; | ||
| 153 | - position: fixed; | ||
| 154 | - left: 0; | ||
| 155 | - top: 50%; | ||
| 156 | - margin-top: -162px; | ||
| 157 | - | ||
| 158 | - i { | ||
| 159 | - width: 100%; | ||
| 160 | - height: 120px; | ||
| 161 | - overflow: hidden; | ||
| 162 | - display: block; | ||
| 163 | - background: resolve("home/employ/not.png") center top no-repeat; | ||
| 164 | - background-size: auto 100%; | ||
| 165 | - } | ||
| 166 | - | ||
| 167 | - p { | ||
| 168 | - width: 100%; | ||
| 169 | - height: auto; | ||
| 170 | - overflow: hidden; | ||
| 171 | - padding: 20px 0 0; | ||
| 172 | - font-size: 32px; | ||
| 173 | - text-align: center; | ||
| 174 | - color: #444; | ||
| 175 | - } | ||
| 176 | - | ||
| 177 | - a { | ||
| 178 | - width: 73.75%; | ||
| 179 | - height: 80px; | ||
| 180 | - overflow: hidden; | ||
| 181 | - font-size: 36px; | ||
| 182 | - line-height: 80px; | ||
| 183 | - display: block; | ||
| 184 | - background: #444; | ||
| 185 | - color: #fff; | ||
| 186 | - text-align: center; | ||
| 187 | - margin: 60px auto 0; | ||
| 188 | - border-radius: 0.2rem; | ||
| 189 | - } | ||
| 190 | - } | ||
| 191 | -} | 1 | +@import "coupons"; |
| @@ -103,9 +103,6 @@ | @@ -103,9 +103,6 @@ | ||
| 103 | z-index: 9999; | 103 | z-index: 9999; |
| 104 | display: block; | 104 | display: block; |
| 105 | } | 105 | } |
| 106 | - | ||
| 107 | - &.animation { | ||
| 108 | - } | ||
| 109 | } | 106 | } |
| 110 | 107 | ||
| 111 | .copyright { | 108 | .copyright { |
| @@ -204,7 +201,7 @@ | @@ -204,7 +201,7 @@ | ||
| 204 | &:link, | 201 | &:link, |
| 205 | &:visited, | 202 | &:visited, |
| 206 | &:hover, | 203 | &:hover, |
| 207 | - &:actived { | 204 | + &:active { |
| 208 | color: #000; | 205 | color: #000; |
| 209 | } | 206 | } |
| 210 | } | 207 | } |
| @@ -212,7 +209,7 @@ | @@ -212,7 +209,7 @@ | ||
| 212 | .circle-rightbottom { | 209 | .circle-rightbottom { |
| 213 | position: absolute; | 210 | position: absolute; |
| 214 | width: 25PX; | 211 | width: 25PX; |
| 215 | - height: 0PX; | 212 | + height: 0; |
| 216 | border: 0 solid #323232; | 213 | border: 0 solid #323232; |
| 217 | border-bottom: 25PX solid #323232; | 214 | border-bottom: 25PX solid #323232; |
| 218 | border-radius: 0 0 25PX; | 215 | border-radius: 0 0 25PX; |
| @@ -79,22 +79,26 @@ | @@ -79,22 +79,26 @@ | ||
| 79 | 79 | ||
| 80 | .nav-back { | 80 | .nav-back { |
| 81 | @extend nav; | 81 | @extend nav; |
| 82 | + | ||
| 82 | left: 10px; | 83 | left: 10px; |
| 83 | } | 84 | } |
| 84 | 85 | ||
| 85 | .nav-home { | 86 | .nav-home { |
| 86 | @extend nav; | 87 | @extend nav; |
| 88 | + | ||
| 87 | right: 10px; | 89 | right: 10px; |
| 88 | } | 90 | } |
| 89 | 91 | ||
| 90 | .nav-btn { | 92 | .nav-btn { |
| 91 | @extend nav; | 93 | @extend nav; |
| 94 | + | ||
| 92 | right: 10px; | 95 | right: 10px; |
| 93 | font-size: 14PX; | 96 | font-size: 14PX; |
| 94 | } | 97 | } |
| 95 | 98 | ||
| 96 | .nav-sub-right { | 99 | .nav-sub-right { |
| 97 | @extend nav; | 100 | @extend nav; |
| 101 | + | ||
| 98 | right: 100px; | 102 | right: 100px; |
| 99 | } | 103 | } |
| 100 | 104 |
| 1 | /* ======================= *\ | 1 | /* ======================= *\ |
| 2 | - Module: 图片旋转验证 | 2 | + Module: 图片旋转验证 |
| 3 | \* ======================= */ | 3 | \* ======================= */ |
| 4 | .img-check { | 4 | .img-check { |
| 5 | margin-top: 45px; | 5 | margin-top: 45px; |
| @@ -35,23 +35,3 @@ | @@ -35,23 +35,3 @@ | ||
| 35 | height: 150px; | 35 | height: 150px; |
| 36 | } | 36 | } |
| 37 | } | 37 | } |
| 38 | - | ||
| 39 | -#js-img-check { | ||
| 40 | - &.hide { | ||
| 41 | - display: none !important; | ||
| 42 | - } | ||
| 43 | - &.popup { | ||
| 44 | - display: flex; | ||
| 45 | - align-items: center; | ||
| 46 | - justify-content: center; | ||
| 47 | - position: fixed; | ||
| 48 | - width: 100%; | ||
| 49 | - height: 100%; | ||
| 50 | - left: 0; | ||
| 51 | - right: 0; | ||
| 52 | - bottom: 0; | ||
| 53 | - top: 0; | ||
| 54 | - z-index: 99; | ||
| 55 | - background-color: rgba(0, 0, 0, 0.3); | ||
| 56 | - } | ||
| 57 | -} |
| 1 | /* 新品到着 css */ | 1 | /* 新品到着 css */ |
| 2 | 2 | ||
| 3 | -@import 'layout/panel'; | ||
| 4 | -@import 'layout/swiper'; | ||
| 5 | -@import 'layout/yo-loading'; | ||
| 6 | -@import 'common/filter'; | ||
| 7 | -@import 'common/good'; | ||
| 8 | -@import 'new/recommend'; | ||
| 9 | -@import 'new/handlepick'; | ||
| 10 | -@import 'new/good-tags'; | ||
| 11 | -@import 'new/brand-info'; | ||
| 12 | -@import 'new/brand-recommend'; | ||
| 13 | -@import 'new/article'; | 3 | +@import "layout/panel"; |
| 4 | +@import "layout/swiper"; | ||
| 5 | +@import "layout/yo-loading"; | ||
| 6 | +@import "common/filter"; | ||
| 7 | +@import "common/good"; | ||
| 8 | +@import "new/recommend"; | ||
| 9 | +@import "new/handlepick"; | ||
| 10 | +@import "new/good-tags"; | ||
| 11 | +@import "new/brand-info"; | ||
| 12 | +@import "new/brand-recommend"; | ||
| 13 | +@import "new/article"; | ||
| 14 | 14 | ||
| 15 | body { | 15 | body { |
| 16 | background-color: #f0f0f0; | 16 | background-color: #f0f0f0; |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | -.banner-swiper .swiper-slide { | 19 | +.banner-swiper .swiper-slide { |
| 20 | height: 234px; | 20 | height: 234px; |
| 21 | } | 21 | } |
| 22 | 22 |
| 1 | -@import 'layout/panel'; | ||
| 2 | -@import 'new/recommend'; | 1 | +@import "layout/panel"; |
| 2 | +@import "new/recommend"; | ||
| 3 | 3 | ||
| 4 | .main-wrap { | 4 | .main-wrap { |
| 5 | background-color: #f0f0f0; | 5 | background-color: #f0f0f0; |
| @@ -35,4 +35,4 @@ | @@ -35,4 +35,4 @@ | ||
| 35 | 35 | ||
| 36 | .new-brands .brand-news-count .count { | 36 | .new-brands .brand-news-count .count { |
| 37 | display: none; | 37 | display: none; |
| 38 | -} | ||
| 38 | +} |
-
Please register or login to post a comment