Showing
46 changed files
with
413 additions
and
452 deletions
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | <span>{{this}}</span> | 6 | <span>{{this}}</span> |
| 7 | {{/ studentArr}} | 7 | {{/ studentArr}} |
| 8 | </span> | 8 | </span> |
| 9 | - <a class="checkMySchool"></a> | 9 | + <a class="check-my-school"></a> |
| 10 | </div> | 10 | </div> |
| 11 | <div class="privilege clearfix"> | 11 | <div class="privilege clearfix"> |
| 12 | <a class="privilege-item open-dia" href="javascript:void(0);"> | 12 | <a class="privilege-item open-dia" href="javascript:void(0);"> |
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | </div> | 21 | </div> |
| 22 | <div class="item-content"> | 22 | <div class="item-content"> |
| 23 | <i class="rank-icon top">{{rank}}</i> | 23 | <i class="rank-icon top">{{rank}}</i> |
| 24 | - <h2 {{# sales_phrase}}class="hasActive"{{/ sales_phrase}}>{{name}}</h2> | 24 | + <h2 {{# sales_phrase}}class="has-active"{{/ sales_phrase}}>{{name}}</h2> |
| 25 | {{# active}} | 25 | {{# active}} |
| 26 | <p>{{.}}</p> | 26 | <p>{{.}}</p> |
| 27 | {{/ active}} | 27 | {{/ active}} |
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | <div id="allproduct" class="allproduct"> | 3 | <div id="allproduct" class="allproduct"> |
| 4 | <a href={{allProduct}}> | 4 | <a href={{allProduct}}> |
| 5 | - <p class="allproductParagaraph buriedpoint" data-bp-id ="shop_category_all_1">全部商品</p> | 5 | + <p class="all-product-paragaraph buriedpoint" data-bp-id ="shop_category_all_1">全部商品</p> |
| 6 | <i class="arrow-icon iconfont"></i> | 6 | <i class="arrow-icon iconfont"></i> |
| 7 | </a> | 7 | </a> |
| 8 | </div> | 8 | </div> |
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | "build": "webpack --config ./public/build/webpack.prod.config.js", | 14 | "build": "webpack --config ./public/build/webpack.prod.config.js", |
| 15 | "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js", | 15 | "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js", |
| 16 | "lint-js": "eslint -c .eslintrc --cache .", | 16 | "lint-js": "eslint -c .eslintrc --cache .", |
| 17 | - "lint-css": "stylelint --syntax scss --config .stylelintrc public/scss/**/*.css", | 17 | + "lint-css": "stylelint --syntax scss --config .stylelintrc 'public/scss/**/*.css'", |
| 18 | "lint-vue-js": "eslint -c .eslintrc --cache public/vue/**/*.vue", | 18 | "lint-vue-js": "eslint -c .eslintrc --cache public/vue/**/*.vue", |
| 19 | "lint-vue-css": "stylelint --syntax scss --extract --config .stylelintrc public/vue/**/*.vue", | 19 | "lint-vue-css": "stylelint --syntax scss --extract --config .stylelintrc public/vue/**/*.vue", |
| 20 | "precommit": "node lint.js" | 20 | "precommit": "node lint.js" |
| @@ -346,7 +346,7 @@ $( | @@ -346,7 +346,7 @@ $( | ||
| 346 | default: | 346 | default: |
| 347 | } | 347 | } |
| 348 | 348 | ||
| 349 | - $('.checkMySchool').on('click', function() { | 349 | + $('.check-my-school').on('click', function() { |
| 350 | var sTop = $('#university').offset().top; | 350 | var sTop = $('#university').offset().top; |
| 351 | 351 | ||
| 352 | $(window).scrollTop(sTop); | 352 | $(window).scrollTop(sTop); |
| @@ -119,9 +119,9 @@ $('#hotRank').on('touchstart', function(e) { | @@ -119,9 +119,9 @@ $('#hotRank').on('touchstart', function(e) { | ||
| 119 | var target = ev.target || ev.srcElement; | 119 | var target = ev.target || ev.srcElement; |
| 120 | 120 | ||
| 121 | if (target.nodeName.toLowerCase() === 'span') { | 121 | if (target.nodeName.toLowerCase() === 'span') { |
| 122 | - target.parentNode.className = 'bgActive ' + target.parentNode.className; | 122 | + target.parentNode.className = 'bg-active ' + target.parentNode.className; |
| 123 | } | 123 | } |
| 124 | }).on('touchend touchcancel', function() { | 124 | }).on('touchend touchcancel', function() { |
| 125 | - $('.s-goods-nav .nav-item').removeClass('bgActive'); | 125 | + $('.s-goods-nav .nav-item').removeClass('bg-active'); |
| 126 | }); | 126 | }); |
| 127 | 127 |
| @@ -713,7 +713,6 @@ | @@ -713,7 +713,6 @@ | ||
| 713 | .name { | 713 | .name { |
| 714 | font-size: 50px; | 714 | font-size: 50px; |
| 715 | margin-top: 50px; | 715 | margin-top: 50px; |
| 716 | - display: inline-block; | ||
| 717 | max-height: 120px; | 716 | max-height: 120px; |
| 718 | overflow: hidden; | 717 | overflow: hidden; |
| 719 | text-overflow: ellipsis; | 718 | text-overflow: ellipsis; |
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | } | 41 | } |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | - .checkMySchool { | 44 | + .check-my-school { |
| 45 | width: 150px; | 45 | width: 150px; |
| 46 | height: 30px; | 46 | height: 30px; |
| 47 | position: absolute; | 47 | position: absolute; |
| @@ -145,10 +145,10 @@ | @@ -145,10 +145,10 @@ | ||
| 145 | &:last-child { | 145 | &:last-child { |
| 146 | font-size: 27px; | 146 | font-size: 27px; |
| 147 | text-align: right; | 147 | text-align: right; |
| 148 | + } | ||
| 148 | 149 | ||
| 149 | - span { | ||
| 150 | - color: #ac8412; | ||
| 151 | - } | 150 | + &:last-child span { |
| 151 | + color: #ac8412; | ||
| 152 | } | 152 | } |
| 153 | } | 153 | } |
| 154 | } | 154 | } |
| @@ -354,4 +354,4 @@ | @@ -354,4 +354,4 @@ | ||
| 354 | position: relative; | 354 | position: relative; |
| 355 | } | 355 | } |
| 356 | } | 356 | } |
| 357 | -} | ||
| 357 | +} |
| @@ -100,7 +100,6 @@ | @@ -100,7 +100,6 @@ | ||
| 100 | display: inline-block; | 100 | display: inline-block; |
| 101 | height: 35px; | 101 | height: 35px; |
| 102 | line-height: 35px; | 102 | line-height: 35px; |
| 103 | - overflow: hidden; | ||
| 104 | white-space: nowrap; | 103 | white-space: nowrap; |
| 105 | overflow: hidden; | 104 | overflow: hidden; |
| 106 | text-overflow: ellipsis; | 105 | text-overflow: ellipsis; |
| @@ -353,99 +353,97 @@ | @@ -353,99 +353,97 @@ | ||
| 353 | } | 353 | } |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | - .class { | ||
| 357 | - .class-item { | ||
| 358 | - border-top: solid 1px #e0e0e0; | ||
| 359 | - border-bottom: solid 1px #e0e0e0; | ||
| 360 | - padding: 30px; | ||
| 361 | - margin-bottom: 30px; | ||
| 362 | - background-color: #fff; | 356 | + .class .class-item { |
| 357 | + border-top: solid 1px #e0e0e0; | ||
| 358 | + border-bottom: solid 1px #e0e0e0; | ||
| 359 | + padding: 30px; | ||
| 360 | + margin-bottom: 30px; | ||
| 361 | + background-color: #fff; | ||
| 363 | 362 | ||
| 364 | - .pic { | ||
| 365 | - img { | ||
| 366 | - width: 100%; | ||
| 367 | - } | 363 | + .pic { |
| 364 | + img { | ||
| 365 | + width: 100%; | ||
| 368 | } | 366 | } |
| 367 | + } | ||
| 369 | 368 | ||
| 370 | - .info { | ||
| 371 | - height: 88px; | ||
| 372 | - line-height: 88px; | 369 | + .info { |
| 370 | + height: 88px; | ||
| 371 | + line-height: 88px; | ||
| 373 | 372 | ||
| 374 | - .name { | ||
| 375 | - color: #444; | ||
| 376 | - font-size: 38px; | ||
| 377 | - float: left; | ||
| 378 | - width: 530px; | ||
| 379 | - } | 373 | + .name { |
| 374 | + color: #444; | ||
| 375 | + font-size: 38px; | ||
| 376 | + float: left; | ||
| 377 | + width: 530px; | ||
| 378 | + } | ||
| 380 | 379 | ||
| 381 | - .price { | ||
| 382 | - font-size: 50px; | ||
| 383 | - color: #d0021b; | ||
| 384 | - float: right; | ||
| 385 | - width: 160px; | ||
| 386 | - text-align: right; | ||
| 387 | - | ||
| 388 | - span { | ||
| 389 | - font-size: 30px; | ||
| 390 | - padding-right: 10px; | ||
| 391 | - } | ||
| 392 | - } | 380 | + .price { |
| 381 | + font-size: 50px; | ||
| 382 | + color: #d0021b; | ||
| 383 | + float: right; | ||
| 384 | + width: 160px; | ||
| 385 | + text-align: right; | ||
| 393 | 386 | ||
| 394 | - .free { | ||
| 395 | - text-align: right; | ||
| 396 | - float: right; | ||
| 397 | - color: #d0021b; | 387 | + span { |
| 398 | font-size: 30px; | 388 | font-size: 30px; |
| 399 | - width: 160px; | 389 | + padding-right: 10px; |
| 400 | } | 390 | } |
| 401 | } | 391 | } |
| 402 | 392 | ||
| 403 | - .tip { | ||
| 404 | - float: left; | ||
| 405 | - width: 100%; | 393 | + .free { |
| 394 | + text-align: right; | ||
| 395 | + float: right; | ||
| 396 | + color: #d0021b; | ||
| 397 | + font-size: 30px; | ||
| 398 | + width: 160px; | ||
| 399 | + } | ||
| 400 | + } | ||
| 406 | 401 | ||
| 407 | - div { | ||
| 408 | - font-size: 28px; | ||
| 409 | - color: #444; | ||
| 410 | - float: left; | ||
| 411 | - line-height: 45px; | ||
| 412 | - } | 402 | + .tip { |
| 403 | + float: left; | ||
| 404 | + width: 100%; | ||
| 413 | 405 | ||
| 414 | - a { | ||
| 415 | - display: block; | ||
| 416 | - width: 160px; | ||
| 417 | - height: 70px; | ||
| 418 | - background-color: #d0021b; | ||
| 419 | - color: #fff; | ||
| 420 | - float: right; | ||
| 421 | - text-align: center; | ||
| 422 | - line-height: 70px; | ||
| 423 | - border-radius: 10px; | ||
| 424 | - margin-top: 10px; | ||
| 425 | - } | 406 | + div { |
| 407 | + font-size: 28px; | ||
| 408 | + color: #444; | ||
| 409 | + float: left; | ||
| 410 | + line-height: 45px; | ||
| 411 | + } | ||
| 426 | 412 | ||
| 427 | - .disable { | ||
| 428 | - background-color: #b0b0b0; | ||
| 429 | - color: #fff; | ||
| 430 | - } | 413 | + a { |
| 414 | + display: block; | ||
| 415 | + width: 160px; | ||
| 416 | + height: 70px; | ||
| 417 | + background-color: #d0021b; | ||
| 418 | + color: #fff; | ||
| 419 | + float: right; | ||
| 420 | + text-align: center; | ||
| 421 | + line-height: 70px; | ||
| 422 | + border-radius: 10px; | ||
| 423 | + margin-top: 10px; | ||
| 424 | + } | ||
| 431 | 425 | ||
| 432 | - .any-time { | ||
| 433 | - color: #444; | ||
| 434 | - font-size: 30px; | ||
| 435 | - background-color: #fff; | ||
| 436 | - text-align: right; | ||
| 437 | - } | 426 | + .disable { |
| 427 | + background-color: #b0b0b0; | ||
| 428 | + color: #fff; | ||
| 429 | + } | ||
| 438 | 430 | ||
| 439 | - .end { | ||
| 440 | - width: 100px; | ||
| 441 | - height: 30px; | ||
| 442 | - line-height: 30px; | ||
| 443 | - border-radius: 15px; | ||
| 444 | - font-size: 20px; | ||
| 445 | - color: #888; | ||
| 446 | - background-color: #e0e0e0; | ||
| 447 | - margin-top: 25px; | ||
| 448 | - } | 431 | + .any-time { |
| 432 | + color: #444; | ||
| 433 | + font-size: 30px; | ||
| 434 | + background-color: #fff; | ||
| 435 | + text-align: right; | ||
| 436 | + } | ||
| 437 | + | ||
| 438 | + .end { | ||
| 439 | + width: 100px; | ||
| 440 | + height: 30px; | ||
| 441 | + line-height: 30px; | ||
| 442 | + border-radius: 15px; | ||
| 443 | + font-size: 20px; | ||
| 444 | + color: #888; | ||
| 445 | + background-color: #e0e0e0; | ||
| 446 | + margin-top: 25px; | ||
| 449 | } | 447 | } |
| 450 | } | 448 | } |
| 451 | } | 449 | } |
| @@ -667,30 +665,30 @@ | @@ -667,30 +665,30 @@ | ||
| 667 | background-color: #fff; | 665 | background-color: #fff; |
| 668 | height: 100px; | 666 | height: 100px; |
| 669 | overflow: hidden; | 667 | overflow: hidden; |
| 668 | + } | ||
| 670 | 669 | ||
| 671 | - ul { | ||
| 672 | - float: left; | ||
| 673 | - width: auto; | ||
| 674 | - | ||
| 675 | - .nav-item { | ||
| 676 | - width: 150px; | ||
| 677 | - float: left; | ||
| 678 | - padding: 10px 0; | 670 | + .time-nav ul { |
| 671 | + float: left; | ||
| 672 | + width: auto; | ||
| 679 | 673 | ||
| 680 | - &.active { | ||
| 681 | - p { | ||
| 682 | - color: #444; | ||
| 683 | - font-weight: bold; | ||
| 684 | - } | ||
| 685 | - } | 674 | + .nav-item { |
| 675 | + width: 150px; | ||
| 676 | + float: left; | ||
| 677 | + padding: 10px 0; | ||
| 686 | 678 | ||
| 679 | + &.active { | ||
| 687 | p { | 680 | p { |
| 688 | - font-size: 28px; | ||
| 689 | - color: #b0b0b0; | ||
| 690 | - text-align: center; | ||
| 691 | - line-height: 40px; | 681 | + color: #444; |
| 682 | + font-weight: bold; | ||
| 692 | } | 683 | } |
| 693 | } | 684 | } |
| 685 | + | ||
| 686 | + p { | ||
| 687 | + font-size: 28px; | ||
| 688 | + color: #b0b0b0; | ||
| 689 | + text-align: center; | ||
| 690 | + line-height: 40px; | ||
| 691 | + } | ||
| 694 | } | 692 | } |
| 695 | } | 693 | } |
| 696 | 694 | ||
| @@ -856,49 +854,49 @@ | @@ -856,49 +854,49 @@ | ||
| 856 | .chosen-list { | 854 | .chosen-list { |
| 857 | border-top: solid 1px #e0e0e0; | 855 | border-top: solid 1px #e0e0e0; |
| 858 | background-color: #fff; | 856 | background-color: #fff; |
| 857 | + } | ||
| 859 | 858 | ||
| 860 | - .item { | ||
| 861 | - padding: 30px; | ||
| 862 | - border-bottom: solid 1px #e0e0e0; | ||
| 863 | - display: block; | 859 | + .chosen-list .item { |
| 860 | + padding: 30px; | ||
| 861 | + border-bottom: solid 1px #e0e0e0; | ||
| 862 | + display: block; | ||
| 864 | 863 | ||
| 865 | - input { | ||
| 866 | - float: left; | ||
| 867 | - margin-top: 35px; | 864 | + input { |
| 865 | + float: left; | ||
| 866 | + margin-top: 35px; | ||
| 867 | + } | ||
| 868 | + | ||
| 869 | + .pic { | ||
| 870 | + width: 100px; | ||
| 871 | + height: 100px; | ||
| 872 | + border-radius: 50%; | ||
| 873 | + overflow: hidden; | ||
| 874 | + float: left; | ||
| 875 | + margin: 0 30px; | ||
| 876 | + | ||
| 877 | + img { | ||
| 878 | + width: 100%; | ||
| 879 | + height: 100%; | ||
| 868 | } | 880 | } |
| 881 | + } | ||
| 869 | 882 | ||
| 870 | - .pic { | ||
| 871 | - width: 100px; | ||
| 872 | - height: 100px; | ||
| 873 | - border-radius: 50%; | ||
| 874 | - overflow: hidden; | ||
| 875 | - float: left; | ||
| 876 | - margin: 0 30px; | 883 | + .info { |
| 884 | + width: 500px; | ||
| 885 | + float: left; | ||
| 877 | 886 | ||
| 878 | - img { | ||
| 879 | - width: 100%; | ||
| 880 | - height: 100%; | ||
| 881 | - } | 887 | + .name { |
| 888 | + color: #444; | ||
| 889 | + font-size: 38px; | ||
| 890 | + line-height: 50px; | ||
| 882 | } | 891 | } |
| 883 | 892 | ||
| 884 | - .info { | ||
| 885 | - width: 500px; | ||
| 886 | - float: left; | ||
| 887 | - | ||
| 888 | - .name { | ||
| 889 | - color: #444; | ||
| 890 | - font-size: 38px; | ||
| 891 | - line-height: 50px; | ||
| 892 | - } | ||
| 893 | - | ||
| 894 | - .intro { | ||
| 895 | - color: #444; | ||
| 896 | - font-size: 24px; | ||
| 897 | - line-height: 50px; | ||
| 898 | - white-space: nowrap; | ||
| 899 | - overflow: hidden; | ||
| 900 | - text-overflow: ellipsis; | ||
| 901 | - } | 893 | + .intro { |
| 894 | + color: #444; | ||
| 895 | + font-size: 24px; | ||
| 896 | + line-height: 50px; | ||
| 897 | + white-space: nowrap; | ||
| 898 | + overflow: hidden; | ||
| 899 | + text-overflow: ellipsis; | ||
| 902 | } | 900 | } |
| 903 | } | 901 | } |
| 904 | } | 902 | } |
| @@ -1453,4 +1451,4 @@ | @@ -1453,4 +1451,4 @@ | ||
| 1453 | line-height: 50px; | 1451 | line-height: 50px; |
| 1454 | } | 1452 | } |
| 1455 | } | 1453 | } |
| 1456 | -} | ||
| 1454 | +} |
| @@ -6,7 +6,6 @@ | @@ -6,7 +6,6 @@ | ||
| 6 | background: resolve("activity/vip-day/activity.jpg"); | 6 | background: resolve("activity/vip-day/activity.jpg"); |
| 7 | background-size: 100% 100%; | 7 | background-size: 100% 100%; |
| 8 | height: 363px; | 8 | height: 363px; |
| 9 | - /*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/ | ||
| 10 | } | 9 | } |
| 11 | 10 | ||
| 12 | .vip-day-footer { | 11 | .vip-day-footer { |
| @@ -310,7 +309,7 @@ | @@ -310,7 +309,7 @@ | ||
| 310 | .vip-good-name { | 309 | .vip-good-name { |
| 311 | font-size: 20px; | 310 | font-size: 20px; |
| 312 | color: #fff; | 311 | color: #fff; |
| 313 | - height: calc(2*20*1.4px); | 312 | + height: 56px; |
| 314 | margin-bottom: 10px; | 313 | margin-bottom: 10px; |
| 315 | margin-left: 5px; | 314 | margin-left: 5px; |
| 316 | margin-right: 5px; | 315 | margin-right: 5px; |
| @@ -101,8 +101,8 @@ $border-radius: 8px; | @@ -101,8 +101,8 @@ $border-radius: 8px; | ||
| 101 | 101 | ||
| 102 | .game-item { | 102 | .game-item { |
| 103 | float: left; | 103 | float: left; |
| 104 | - width: calc((586-4) / 3px); | ||
| 105 | - height: calc((406-4) / 3px); | 104 | + width: 194px; |
| 105 | + height: 134px; | ||
| 106 | margin-right: 2px; | 106 | margin-right: 2px; |
| 107 | margin-bottom: 2px; | 107 | margin-bottom: 2px; |
| 108 | 108 |
| 1 | -.vip-day10.entry { | 1 | +.vip-day10 .entry { |
| 2 | background: resolve("activity/vip-day/vip-day1028/bg.jpg"); | 2 | background: resolve("activity/vip-day/vip-day1028/bg.jpg"); |
| 3 | background-size: 100% 100%; | 3 | background-size: 100% 100%; |
| 4 | } | 4 | } |
| @@ -7,7 +7,6 @@ | @@ -7,7 +7,6 @@ | ||
| 7 | background: resolve("activity/vip-day/vip-day1028/head.gif"); | 7 | background: resolve("activity/vip-day/vip-day1028/head.gif"); |
| 8 | background-size: 100% 100%; | 8 | background-size: 100% 100%; |
| 9 | height: 486px; | 9 | height: 486px; |
| 10 | - /*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/ | ||
| 11 | } | 10 | } |
| 12 | 11 | ||
| 13 | .vip-day10-slogan { | 12 | .vip-day10-slogan { |
| @@ -258,4 +257,4 @@ | @@ -258,4 +257,4 @@ | ||
| 258 | img { | 257 | img { |
| 259 | width: 421px; | 258 | width: 421px; |
| 260 | } | 259 | } |
| 261 | -} | ||
| 260 | +} |
| @@ -101,8 +101,8 @@ $border-radius: 8px; | @@ -101,8 +101,8 @@ $border-radius: 8px; | ||
| 101 | 101 | ||
| 102 | .game-item { | 102 | .game-item { |
| 103 | float: left; | 103 | float: left; |
| 104 | - width: calc((586-4) / 3px); | ||
| 105 | - height: calc((406-4) / 3px); | 104 | + width: 194px; |
| 105 | + height: 134px; | ||
| 106 | margin-right: 2px; | 106 | margin-right: 2px; |
| 107 | margin-bottom: 2px; | 107 | margin-bottom: 2px; |
| 108 | 108 |
| @@ -47,9 +47,6 @@ | @@ -47,9 +47,6 @@ | ||
| 47 | } | 47 | } |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | - /*-------------------------------------*\ | ||
| 51 | - .coupon 单个优惠券 | ||
| 52 | - \*-------------------------------------*/ | ||
| 53 | .coupon { | 50 | .coupon { |
| 54 | min-height: 165px; | 51 | min-height: 165px; |
| 55 | margin-left: 30px; | 52 | margin-left: 30px; |
| @@ -104,4 +101,4 @@ | @@ -104,4 +101,4 @@ | ||
| 104 | 101 | ||
| 105 | body.coupon-drawer-open { | 102 | body.coupon-drawer-open { |
| 106 | overflow: hidden; | 103 | overflow: hidden; |
| 107 | -} | ||
| 104 | +} |
| @@ -57,6 +57,7 @@ | @@ -57,6 +57,7 @@ | ||
| 57 | &.highlight { | 57 | &.highlight { |
| 58 | color: $basicBtnC; | 58 | color: $basicBtnC; |
| 59 | } | 59 | } |
| 60 | + | ||
| 60 | font-size: 28px; | 61 | font-size: 28px; |
| 61 | float: left; | 62 | float: left; |
| 62 | width: 50%; | 63 | width: 50%; |
| @@ -68,6 +69,7 @@ | @@ -68,6 +69,7 @@ | ||
| 68 | padding-right: 5PX; | 69 | padding-right: 5PX; |
| 69 | font-size: inherit; | 70 | font-size: inherit; |
| 70 | } | 71 | } |
| 72 | + | ||
| 71 | position: relative; | 73 | position: relative; |
| 72 | 74 | ||
| 73 | .animate-count { | 75 | .animate-count { |
| @@ -198,20 +200,19 @@ | @@ -198,20 +200,19 @@ | ||
| 198 | } | 200 | } |
| 199 | } | 201 | } |
| 200 | 202 | ||
| 201 | - .goods-consults.customer-consults { | ||
| 202 | - .consult-item { | ||
| 203 | - @mixin consult-item ; | ||
| 204 | - margin-top: 0; | ||
| 205 | - margin-bottom: 15px; | ||
| 206 | - } | ||
| 207 | - } | ||
| 208 | - | ||
| 209 | .goods-consults { | 203 | .goods-consults { |
| 210 | overflow: hidden; | 204 | overflow: hidden; |
| 211 | padding: 0; | 205 | padding: 0; |
| 212 | background: none; | 206 | background: none; |
| 213 | } | 207 | } |
| 214 | 208 | ||
| 209 | + .goods-consults .customer-consults .consult-item { | ||
| 210 | + @mixin consult-item ; | ||
| 211 | + | ||
| 212 | + margin-top: 0; | ||
| 213 | + margin-bottom: 15px; | ||
| 214 | + } | ||
| 215 | + | ||
| 215 | .readmore { | 216 | .readmore { |
| 216 | display: block; | 217 | display: block; |
| 217 | height: 88px; | 218 | height: 88px; |
| @@ -238,6 +239,7 @@ | @@ -238,6 +239,7 @@ | ||
| 238 | 239 | ||
| 239 | .goods-consults .faq-item { | 240 | .goods-consults .faq-item { |
| 240 | @mixin consult-item ; | 241 | @mixin consult-item ; |
| 242 | + | ||
| 241 | margin-top: 0; | 243 | margin-top: 0; |
| 242 | margin-bottom: 15px; | 244 | margin-bottom: 15px; |
| 243 | 245 |
| @@ -89,7 +89,6 @@ $basicBtnC: #eb0313; | @@ -89,7 +89,6 @@ $basicBtnC: #eb0313; | ||
| 89 | box-sizing: border-box; | 89 | box-sizing: border-box; |
| 90 | padding: 6px 3%; | 90 | padding: 6px 3%; |
| 91 | width: 49.9%; | 91 | width: 49.9%; |
| 92 | - width: 49.9%; | ||
| 93 | height: 100%; | 92 | height: 100%; |
| 94 | border: 1px solid #fff; | 93 | border: 1px solid #fff; |
| 95 | background-color: $tableCellC; | 94 | background-color: $tableCellC; |
| @@ -891,10 +890,7 @@ $basicBtnC: #eb0313; | @@ -891,10 +890,7 @@ $basicBtnC: #eb0313; | ||
| 891 | } | 890 | } |
| 892 | 891 | ||
| 893 | .content-main.consult-content-main { | 892 | .content-main.consult-content-main { |
| 894 | - padding-right: 28px; | ||
| 895 | - padding-left: 28px; | ||
| 896 | - padding-top: 20px; | ||
| 897 | - padding-bottom: 20px; | 893 | + padding: 20px 28px; |
| 898 | 894 | ||
| 899 | .question { | 895 | .question { |
| 900 | font-size: 24px; | 896 | font-size: 24px; |
| @@ -33,43 +33,43 @@ | @@ -33,43 +33,43 @@ | ||
| 33 | 33 | ||
| 34 | .method-1 { | 34 | .method-1 { |
| 35 | li:nth-child(1) .intro-img { | 35 | li:nth-child(1) .intro-img { |
| 36 | - background-image: resolve(product/help/1.png); | 36 | + background-image: resolve("product/help/1.png"); |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | li:nth-child(2) .intro-img { | 39 | li:nth-child(2) .intro-img { |
| 40 | - background-image: resolve(product/help/2.png); | 40 | + background-image: resolve("product/help/2.png"); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | li:nth-child(3) .intro-img { | 43 | li:nth-child(3) .intro-img { |
| 44 | - background-image: resolve(product/help/3.png); | 44 | + background-image: resolve("product/help/3.png"); |
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | .method-2 { | 48 | .method-2 { |
| 49 | li:nth-child(1) .intro-img { | 49 | li:nth-child(1) .intro-img { |
| 50 | - background-image: resolve(product/help/4.png); | 50 | + background-image: resolve("product/help/4.png"); |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | li:nth-child(2) .intro-img { | 53 | li:nth-child(2) .intro-img { |
| 54 | - background-image: resolve(product/help/5.png); | 54 | + background-image: resolve("product/help/5.png"); |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | li:nth-child(3) .intro-img { | 57 | li:nth-child(3) .intro-img { |
| 58 | - background-image: resolve(product/help/6.png); | 58 | + background-image: resolve("product/help/6.png"); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | li:nth-child(4) .intro-img { | 61 | li:nth-child(4) .intro-img { |
| 62 | - background-image: resolve(product/help/7.png); | 62 | + background-image: resolve("product/help/7.png"); |
| 63 | } | 63 | } |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | .how { | 66 | .how { |
| 67 | li:nth-child(1) .intro-img { | 67 | li:nth-child(1) .intro-img { |
| 68 | - background-image: resolve(product/help/8.png); | 68 | + background-image: resolve("product/help/8.png"); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | li:nth-child(2) .intro-img { | 71 | li:nth-child(2) .intro-img { |
| 72 | - background-image: resolve(product/help/9.png); | 72 | + background-image: resolve("product/help/9.png"); |
| 73 | margin-bottom: 0; | 73 | margin-bottom: 0; |
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| @@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
| 60 | color: #444; | 60 | color: #444; |
| 61 | font-size: 28px; | 61 | font-size: 28px; |
| 62 | 62 | ||
| 63 | - &.hasActive { | 63 | + &.has-active { |
| 64 | margin: 5px 0 0 !important; | 64 | margin: 5px 0 0 !important; |
| 65 | } | 65 | } |
| 66 | } | 66 | } |
| @@ -99,7 +99,6 @@ | @@ -99,7 +99,6 @@ | ||
| 99 | 99 | ||
| 100 | li { | 100 | li { |
| 101 | float: left; | 101 | float: left; |
| 102 | - width: auto; | ||
| 103 | height: 67px; | 102 | height: 67px; |
| 104 | line-height: 67px; | 103 | line-height: 67px; |
| 105 | width: 145px; | 104 | width: 145px; |
| @@ -143,7 +142,7 @@ | @@ -143,7 +142,7 @@ | ||
| 143 | color: #000; | 142 | color: #000; |
| 144 | } | 143 | } |
| 145 | 144 | ||
| 146 | - &.bgActive { | 145 | + &.bg-active { |
| 147 | color: #000; | 146 | color: #000; |
| 148 | background-color: #e0e0e0; | 147 | background-color: #e0e0e0; |
| 149 | } | 148 | } |
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | box-sizing: border-box; | 14 | box-sizing: border-box; |
| 15 | padding: 0 22px; | 15 | padding: 0 22px; |
| 16 | width: 100%; | 16 | width: 100%; |
| 17 | - height: 70px; /**父元素hidden 隐藏滚动条**/ | 17 | + height: 70px; |
| 18 | border-bottom: 1px solid #e6e6e6; | 18 | border-bottom: 1px solid #e6e6e6; |
| 19 | background: #f0f0f0; | 19 | background: #f0f0f0; |
| 20 | color: #999; | 20 | color: #999; |
| @@ -333,7 +333,6 @@ | @@ -333,7 +333,6 @@ | ||
| 333 | bottom: 258px; | 333 | bottom: 258px; |
| 334 | } | 334 | } |
| 335 | 335 | ||
| 336 | - /* 搜索分割 */ | ||
| 337 | .intro-text, | 336 | .intro-text, |
| 338 | .word-content { | 337 | .word-content { |
| 339 | margin-left: -0.375rem; | 338 | margin-left: -0.375rem; |
| @@ -397,4 +396,6 @@ | @@ -397,4 +396,6 @@ | ||
| 397 | margin-top: 0; | 396 | margin-top: 0; |
| 398 | border-top: none; | 397 | border-top: none; |
| 399 | } | 398 | } |
| 399 | +======= | ||
| 400 | +>>>>>>> feature/indexcss | ||
| 400 | } | 401 | } |
| @@ -70,7 +70,6 @@ | @@ -70,7 +70,6 @@ | ||
| 70 | height: 62px; | 70 | height: 62px; |
| 71 | line-height: 62px; | 71 | line-height: 62px; |
| 72 | padding: 0 20px; | 72 | padding: 0 20px; |
| 73 | - font-size: 28px; | ||
| 74 | color: #000; | 73 | color: #000; |
| 75 | overflow: hidden; | 74 | overflow: hidden; |
| 76 | text-overflow: ellipsis; | 75 | text-overflow: ellipsis; |
| @@ -6,109 +6,109 @@ | @@ -6,109 +6,109 @@ | ||
| 6 | height: 119px; | 6 | height: 119px; |
| 7 | overflow: hidden; | 7 | overflow: hidden; |
| 8 | 8 | ||
| 9 | - ul { | ||
| 10 | - width: auto; | ||
| 11 | - overflow: hidden; | ||
| 12 | - height: 100%; | ||
| 13 | - padding-top: 20px; | ||
| 14 | - | ||
| 15 | - li { | ||
| 16 | - width: 226px; | ||
| 17 | - height: 79px; | ||
| 18 | - border-right: solid 1PX #e1e1e1; | ||
| 19 | - text-align: center; | ||
| 20 | - float: left; | ||
| 21 | - $status-list: over, now, wait; | ||
| 22 | - | ||
| 23 | - @each $status in $status-list { | ||
| 24 | - &.$(status) { | ||
| 25 | - .tip-$(status), | ||
| 26 | - .info-$(status) { | ||
| 27 | - display: initial; | ||
| 28 | - } | ||
| 29 | - } | ||
| 30 | - } | ||
| 31 | - | ||
| 32 | - &.last { | ||
| 33 | - .last-info { | ||
| 34 | - display: block; | ||
| 35 | - } | 9 | + &.fix-top { |
| 10 | + position: fixed; | ||
| 11 | + top: 0; | ||
| 12 | + right: 0; | ||
| 13 | + left: 0; | ||
| 14 | + z-index: 100; | ||
| 15 | + box-shadow: 0 1px 0 0 #e1e1e1; | ||
| 16 | + } | ||
| 17 | + } | ||
| 18 | +} | ||
| 36 | 19 | ||
| 37 | - .last-count-down { | ||
| 38 | - display: none; | ||
| 39 | - } | 20 | +.seckill-list .nav-list ul { |
| 21 | + width: auto; | ||
| 22 | + overflow: hidden; | ||
| 23 | + height: 100%; | ||
| 24 | + padding-top: 20px; | ||
| 25 | + | ||
| 26 | + li { | ||
| 27 | + width: 226px; | ||
| 28 | + height: 79px; | ||
| 29 | + border-right: solid 1PX #e1e1e1; | ||
| 30 | + text-align: center; | ||
| 31 | + float: left; | ||
| 32 | + $status-list: over, now, wait; | ||
| 33 | + | ||
| 34 | + @each $status in $status-list { | ||
| 35 | + &.$(status) { | ||
| 36 | + .tip-$(status), | ||
| 37 | + .info-$(status) { | ||
| 38 | + display: initial; | ||
| 40 | } | 39 | } |
| 40 | + } | ||
| 41 | + } | ||
| 41 | 42 | ||
| 42 | - .status, | ||
| 43 | - .last-info { | ||
| 44 | - display: none; | ||
| 45 | - } | 43 | + &.last { |
| 44 | + .last-info { | ||
| 45 | + display: block; | ||
| 46 | + } | ||
| 46 | 47 | ||
| 47 | - p { | ||
| 48 | - font-size: 22px; | ||
| 49 | - } | 48 | + .last-count-down { |
| 49 | + display: none; | ||
| 50 | + } | ||
| 51 | + } | ||
| 50 | 52 | ||
| 51 | - &:last-child { | ||
| 52 | - border: none; | ||
| 53 | - } | 53 | + .status, |
| 54 | + .last-info { | ||
| 55 | + display: none; | ||
| 56 | + } | ||
| 54 | 57 | ||
| 55 | - &.focus { | ||
| 56 | - width: 300px; | 58 | + p { |
| 59 | + font-size: 22px; | ||
| 60 | + } | ||
| 57 | 61 | ||
| 58 | - .selected { | ||
| 59 | - display: block; | ||
| 60 | - } | 62 | + &:last-child { |
| 63 | + border: none; | ||
| 64 | + } | ||
| 61 | 65 | ||
| 62 | - .normal { | ||
| 63 | - display: none; | ||
| 64 | - } | ||
| 65 | - } | 66 | + &.focus { |
| 67 | + width: 300px; | ||
| 66 | 68 | ||
| 67 | - .selected { | ||
| 68 | - display: none; | ||
| 69 | - color: #d0021b !important; | ||
| 70 | - height: 79px; | ||
| 71 | - line-height: 40px; | 69 | + .selected { |
| 70 | + display: block; | ||
| 71 | + } | ||
| 72 | 72 | ||
| 73 | - .time { | ||
| 74 | - font-weight: bold; | ||
| 75 | - } | ||
| 76 | - } | 73 | + .normal { |
| 74 | + display: none; | ||
| 75 | + } | ||
| 76 | + } | ||
| 77 | 77 | ||
| 78 | - .normal { | ||
| 79 | - display: block; | ||
| 80 | - height: 79px; | ||
| 81 | - line-height: 40px; | ||
| 82 | - } | 78 | + .selected { |
| 79 | + display: none; | ||
| 80 | + color: #d0021b !important; | ||
| 81 | + height: 79px; | ||
| 82 | + line-height: 40px; | ||
| 83 | 83 | ||
| 84 | - .time { | ||
| 85 | - font-size: 30px; | 84 | + .time { |
| 85 | + font-weight: bold; | ||
| 86 | + } | ||
| 87 | + } | ||
| 86 | 88 | ||
| 87 | - span { | ||
| 88 | - margin-right: 5px; | ||
| 89 | - font-size: 30px; | ||
| 90 | - } | ||
| 91 | - } | 89 | + .normal { |
| 90 | + display: block; | ||
| 91 | + height: 79px; | ||
| 92 | + line-height: 40px; | ||
| 93 | + } | ||
| 92 | 94 | ||
| 93 | - .tick { | ||
| 94 | - font-size: 20px; | ||
| 95 | - background-color: #d60117; | ||
| 96 | - color: #fff; | ||
| 97 | - margin-left: 10px; | ||
| 98 | - border-radius: 3PX; | ||
| 99 | - padding-left: 5px; | ||
| 100 | - padding-right: 5px; | ||
| 101 | - } | 95 | + .time { |
| 96 | + font-size: 30px; | ||
| 97 | + | ||
| 98 | + span { | ||
| 99 | + margin-right: 5px; | ||
| 100 | + font-size: 30px; | ||
| 102 | } | 101 | } |
| 103 | } | 102 | } |
| 104 | 103 | ||
| 105 | - &.fix-top { | ||
| 106 | - position: fixed; | ||
| 107 | - top: 0; | ||
| 108 | - right: 0; | ||
| 109 | - left: 0; | ||
| 110 | - z-index: 100; | ||
| 111 | - box-shadow: 0 1px 0 0 #e1e1e1; | 104 | + .tick { |
| 105 | + font-size: 20px; | ||
| 106 | + background-color: #d60117; | ||
| 107 | + color: #fff; | ||
| 108 | + margin-left: 10px; | ||
| 109 | + border-radius: 3PX; | ||
| 110 | + padding-left: 5px; | ||
| 111 | + padding-right: 5px; | ||
| 112 | } | 112 | } |
| 113 | } | 113 | } |
| 114 | } | 114 | } |
| 1 | -.seckill-list { | ||
| 2 | - .product-list { | ||
| 3 | - background-color: #fff; | ||
| 4 | - margin-top: 1px; | ||
| 5 | - | ||
| 6 | - .item { | ||
| 7 | - position: relative; | ||
| 8 | - padding: 20px 30px; | ||
| 9 | - display: -webkit-box; | ||
| 10 | - border-bottom: solid 1PX #e1e1e1; | ||
| 11 | - | ||
| 12 | - &:first-child { | ||
| 13 | - border-top: solid 1PX #e1e1e1; | ||
| 14 | - } | 1 | +.seckill-list .product-list { |
| 2 | + background-color: #fff; | ||
| 3 | + margin-top: 1px; | ||
| 4 | + | ||
| 5 | + .item-link { | ||
| 6 | + position: absolute; | ||
| 7 | + top: 0; | ||
| 8 | + right: 0; | ||
| 9 | + bottom: 0; | ||
| 10 | + left: 0; | ||
| 11 | + z-index: 1; | ||
| 12 | + } | ||
| 13 | +} | ||
| 15 | 14 | ||
| 16 | - .item-img { | ||
| 17 | - width: 152px; | ||
| 18 | - margin-right: 30px; | 15 | +.seckill-list .product-list .item { |
| 16 | + position: relative; | ||
| 17 | + padding: 20px 30px; | ||
| 18 | + display: -webkit-box; | ||
| 19 | + border-bottom: solid 1PX #e1e1e1; | ||
| 19 | 20 | ||
| 20 | - img { | ||
| 21 | - width: 100%; | ||
| 22 | - } | 21 | + &:first-child { |
| 22 | + border-top: solid 1PX #e1e1e1; | ||
| 23 | + } | ||
| 24 | + | ||
| 25 | + .item-img { | ||
| 26 | + width: 152px; | ||
| 27 | + margin-right: 30px; | ||
| 28 | + | ||
| 29 | + img { | ||
| 30 | + width: 100%; | ||
| 31 | + } | ||
| 32 | + } | ||
| 33 | +} | ||
| 34 | + | ||
| 35 | +.seckill-list .product-list .item .item-info { | ||
| 36 | + -webkit-box-flex: 1; | ||
| 37 | + position: relative; | ||
| 38 | + min-height: 202px; | ||
| 39 | + | ||
| 40 | + .item-title { | ||
| 41 | + font-size: 28px; | ||
| 42 | + color: #444; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + .item-price { | ||
| 46 | + margin-top: 15px; | ||
| 47 | + | ||
| 48 | + ins { | ||
| 49 | + color: #d0021b; | ||
| 50 | + font-size: 34px; | ||
| 51 | + text-decoration: none; | ||
| 52 | + margin-right: 10px; | ||
| 53 | + } | ||
| 54 | + | ||
| 55 | + del { | ||
| 56 | + font-size: 20px; | ||
| 57 | + color: #000; | ||
| 58 | + color: rgb(176, 176, 176); | ||
| 59 | + text-decoration: line-through; | ||
| 60 | + } | ||
| 61 | + } | ||
| 62 | + | ||
| 63 | + .item-foot { | ||
| 64 | + position: absolute; | ||
| 65 | + left: 0; | ||
| 66 | + right: 0; | ||
| 67 | + bottom: 0; | ||
| 68 | + display: -webkit-box; | ||
| 69 | + | ||
| 70 | + .item-price { | ||
| 71 | + -webkit-box-flex: 1; | ||
| 72 | + } | ||
| 73 | + | ||
| 74 | + .item-time { | ||
| 75 | + -webkit-box-flex: 1; | ||
| 76 | + font-size: 22px; | ||
| 77 | + padding-top: 28px; | ||
| 78 | + -webkit-box-align: end; | ||
| 79 | + | ||
| 80 | + i { | ||
| 81 | + margin-right: 5px; | ||
| 82 | + color: #b0b0b0; | ||
| 23 | } | 83 | } |
| 24 | 84 | ||
| 25 | - .item-info { | ||
| 26 | - -webkit-box-flex: 1; | 85 | + span { |
| 86 | + color: #b0b0b0; | ||
| 87 | + } | ||
| 88 | + } | ||
| 89 | + | ||
| 90 | + .item-button { | ||
| 91 | + width: 200px; | ||
| 92 | + text-align: right; | ||
| 93 | + | ||
| 94 | + .btn { | ||
| 27 | position: relative; | 95 | position: relative; |
| 28 | - min-height: 202px; | 96 | + z-index: 2; |
| 97 | + display: inline-block; | ||
| 98 | + min-width: 160px; | ||
| 99 | + padding: 0 8px; | ||
| 100 | + height: 60px; | ||
| 101 | + line-height: 60px; | ||
| 102 | + text-align: center; | ||
| 103 | + color: #fff; | ||
| 104 | + background-color: #d0021b; | ||
| 105 | + border-radius: 3PX; | ||
| 106 | + border: none; | ||
| 107 | + font-size: 28px; | ||
| 108 | + | ||
| 109 | + &.btn-buy { | ||
| 110 | + background-color: #d0021b; | ||
| 111 | + } | ||
| 29 | 112 | ||
| 30 | - .item-title { | ||
| 31 | - font-size: 28px; | ||
| 32 | - color: #444; | 113 | + &.btn-over { |
| 114 | + background-color: #b2b2b2; | ||
| 33 | } | 115 | } |
| 34 | 116 | ||
| 35 | - .item-price { | ||
| 36 | - margin-top: 15px; | ||
| 37 | - | ||
| 38 | - ins { | ||
| 39 | - color: #d0021b; | ||
| 40 | - font-size: 34px; | ||
| 41 | - text-decoration: none; | ||
| 42 | - margin-right: 10px; | ||
| 43 | - } | ||
| 44 | - | ||
| 45 | - del { | ||
| 46 | - font-size: 20px; | ||
| 47 | - color: #000; | ||
| 48 | - color: rgb(176, 176, 176); | ||
| 49 | - text-decoration: line-through; | ||
| 50 | - } | 117 | + &.btn-chance, |
| 118 | + &.btn-remind-off { | ||
| 119 | + background-color: #fff; | ||
| 120 | + border: solid 1PX #454545; | ||
| 121 | + color: #454545; | ||
| 51 | } | 122 | } |
| 52 | 123 | ||
| 53 | - .item-foot { | ||
| 54 | - position: absolute; | ||
| 55 | - left: 0; | ||
| 56 | - right: 0; | ||
| 57 | - bottom: 0; | ||
| 58 | - display: -webkit-box; | ||
| 59 | - | ||
| 60 | - .item-price { | ||
| 61 | - -webkit-box-flex: 1; | ||
| 62 | - } | ||
| 63 | - | ||
| 64 | - .item-time { | ||
| 65 | - -webkit-box-flex: 1; | ||
| 66 | - font-size: 22px; | ||
| 67 | - padding-top: 28px; | ||
| 68 | - -webkit-box-align: end; | ||
| 69 | - | ||
| 70 | - i { | ||
| 71 | - margin-right: 5px; | ||
| 72 | - color: #b0b0b0; | ||
| 73 | - } | ||
| 74 | - | ||
| 75 | - span { | ||
| 76 | - color: #b0b0b0; | ||
| 77 | - } | ||
| 78 | - } | ||
| 79 | - | ||
| 80 | - .item-button { | ||
| 81 | - width: 200px; | ||
| 82 | - text-align: right; | ||
| 83 | - | ||
| 84 | - .btn { | ||
| 85 | - position: relative; | ||
| 86 | - z-index: 2; | ||
| 87 | - display: inline-block; | ||
| 88 | - min-width: 160px; | ||
| 89 | - padding: 0 8px; | ||
| 90 | - height: 60px; | ||
| 91 | - line-height: 60px; | ||
| 92 | - text-align: center; | ||
| 93 | - color: #fff; | ||
| 94 | - background-color: #d0021b; | ||
| 95 | - border-radius: 3PX; | ||
| 96 | - border: none; | ||
| 97 | - font-size: 28px; | ||
| 98 | - | ||
| 99 | - &.btn-buy { | ||
| 100 | - background-color: #d0021b; | ||
| 101 | - } | ||
| 102 | - | ||
| 103 | - &.btn-over { | ||
| 104 | - background-color: #b2b2b2; | ||
| 105 | - } | ||
| 106 | - | ||
| 107 | - &.btn-chance, | ||
| 108 | - &.btn-remind-off { | ||
| 109 | - background-color: #fff; | ||
| 110 | - border: solid 1PX #454545; | ||
| 111 | - color: #454545; | ||
| 112 | - } | ||
| 113 | - | ||
| 114 | - &.btn-remind-on { | ||
| 115 | - background-color: #000; | ||
| 116 | - } | ||
| 117 | - } | ||
| 118 | - | ||
| 119 | - .old-price { | ||
| 120 | - display: block; | ||
| 121 | - width: 100%; | ||
| 122 | - position: absolute; | ||
| 123 | - top: -35px; | ||
| 124 | - right: 0; | ||
| 125 | - font-size: 20px; | ||
| 126 | - color: #d0021b; | ||
| 127 | - line-height: 30px; | ||
| 128 | - } | ||
| 129 | - } | 124 | + &.btn-remind-on { |
| 125 | + background-color: #000; | ||
| 130 | } | 126 | } |
| 131 | } | 127 | } |
| 132 | - } | ||
| 133 | 128 | ||
| 134 | - .item-link { | ||
| 135 | - position: absolute; | ||
| 136 | - top: 0; | ||
| 137 | - right: 0; | ||
| 138 | - bottom: 0; | ||
| 139 | - left: 0; | ||
| 140 | - z-index: 1; | 129 | + .old-price { |
| 130 | + display: block; | ||
| 131 | + width: 100%; | ||
| 132 | + position: absolute; | ||
| 133 | + top: -35px; | ||
| 134 | + right: 0; | ||
| 135 | + font-size: 20px; | ||
| 136 | + color: #d0021b; | ||
| 137 | + line-height: 30px; | ||
| 138 | + } | ||
| 141 | } | 139 | } |
| 142 | } | 140 | } |
| 143 | } | 141 | } |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | font-size: 72px; | 29 | font-size: 72px; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | - .coupon-left .coupon-left-name { | 32 | + .coupon-left .coupon-left-name { |
| 33 | font-size: 22px; | 33 | font-size: 22px; |
| 34 | width: 250px; | 34 | width: 250px; |
| 35 | height: 100px; | 35 | height: 100px; |
| @@ -82,7 +82,7 @@ | @@ -82,7 +82,7 @@ | ||
| 82 | font-size: 52px; | 82 | font-size: 52px; |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | - .coupon-left .coupon-left-name { | 85 | + .coupon-left .coupon-left-name { |
| 86 | font-size: 16px; | 86 | font-size: 16px; |
| 87 | width: 150px; | 87 | width: 150px; |
| 88 | overflow: hidden; | 88 | overflow: hidden; |
| @@ -43,10 +43,8 @@ | @@ -43,10 +43,8 @@ | ||
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | - li:first-child { | ||
| 47 | - .text { | ||
| 48 | - border-left: none; | ||
| 49 | - } | 46 | + &:first-child .text { |
| 47 | + border-left: none; | ||
| 50 | } | 48 | } |
| 51 | } | 49 | } |
| 52 | 50 | ||
| @@ -129,7 +127,7 @@ | @@ -129,7 +127,7 @@ | ||
| 129 | font-size: 28px; | 127 | font-size: 28px; |
| 130 | background: #fff; | 128 | background: #fff; |
| 131 | overflow: hidden; | 129 | overflow: hidden; |
| 132 | - border-sizing: border-box; | 130 | + box-sizing: border-box; |
| 133 | border-bottom: 1px solid #e0e0e0; | 131 | border-bottom: 1px solid #e0e0e0; |
| 134 | z-index: 2; | 132 | z-index: 2; |
| 135 | 133 | ||
| @@ -142,7 +140,7 @@ | @@ -142,7 +140,7 @@ | ||
| 142 | text-align: center; | 140 | text-align: center; |
| 143 | border-left: 1px solid #e0e0e0; | 141 | border-left: 1px solid #e0e0e0; |
| 144 | margin-top: 30px; | 142 | margin-top: 30px; |
| 145 | - border-sizing: border-box; | 143 | + box-sizing: border-box; |
| 146 | color: #b0b0b0; | 144 | color: #b0b0b0; |
| 147 | 145 | ||
| 148 | &:first-child { | 146 | &:first-child { |
| @@ -167,6 +165,7 @@ | @@ -167,6 +165,7 @@ | ||
| 167 | 165 | ||
| 168 | .banner-area { | 166 | .banner-area { |
| 169 | @extend .banner-top; | 167 | @extend .banner-top; |
| 168 | + | ||
| 170 | margin-bottom: 30px; | 169 | margin-bottom: 30px; |
| 171 | } | 170 | } |
| 172 | 171 | ||
| @@ -401,7 +400,7 @@ | @@ -401,7 +400,7 @@ | ||
| 401 | line-height: 40PX; | 400 | line-height: 40PX; |
| 402 | width: 20%; | 401 | width: 20%; |
| 403 | text-align: center; | 402 | text-align: center; |
| 404 | - border-sizing: border-box; | 403 | + box-sizing: border-box; |
| 405 | position: relative; | 404 | position: relative; |
| 406 | 405 | ||
| 407 | span { | 406 | span { |
| @@ -525,6 +524,7 @@ | @@ -525,6 +524,7 @@ | ||
| 525 | 524 | ||
| 526 | .pos-list { | 525 | .pos-list { |
| 527 | @extend .sale-page; | 526 | @extend .sale-page; |
| 527 | + | ||
| 528 | background: #fff; | 528 | background: #fff; |
| 529 | width: 100%; | 529 | width: 100%; |
| 530 | overflow: hidden; | 530 | overflow: hidden; |
| @@ -536,7 +536,7 @@ | @@ -536,7 +536,7 @@ | ||
| 536 | line-height: 40PX; | 536 | line-height: 40PX; |
| 537 | width: 20%; | 537 | width: 20%; |
| 538 | text-align: center; | 538 | text-align: center; |
| 539 | - border-sizing: border-box; | 539 | + box-sizing: border-box; |
| 540 | 540 | ||
| 541 | span { | 541 | span { |
| 542 | font-size: 14PX; | 542 | font-size: 14PX; |
| @@ -24,19 +24,7 @@ | @@ -24,19 +24,7 @@ | ||
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | .shop-coupon { | 26 | .shop-coupon { |
| 27 | - // padding-right: 30px; | ||
| 28 | background-color: #f0f0f0; | 27 | background-color: #f0f0f0; |
| 29 | - // white-space: nowrap; | ||
| 30 | - | ||
| 31 | - /*.coupon-small { | ||
| 32 | - float: none; | ||
| 33 | - display: inline-block !important; | ||
| 34 | - white-space: normal; | ||
| 35 | - } | ||
| 36 | - | ||
| 37 | - &::-webkit-scrollbar { | ||
| 38 | - display: none; | ||
| 39 | - }*/ | ||
| 40 | } | 28 | } |
| 41 | 29 | ||
| 42 | .shop-swiper { | 30 | .shop-swiper { |
| @@ -5,7 +5,6 @@ | @@ -5,7 +5,6 @@ | ||
| 5 | @import "layout/swiper"; | 5 | @import "layout/swiper"; |
| 6 | 6 | ||
| 7 | /* page */ | 7 | /* page */ |
| 8 | -/* @import "channel/index"; */ | ||
| 9 | @import "channel/banner-top"; | 8 | @import "channel/banner-top"; |
| 10 | @import "channel/floor-header"; | 9 | @import "channel/floor-header"; |
| 11 | @import "channel/search"; | 10 | @import "channel/search"; |
| 1 | .service-chat { | 1 | .service-chat { |
| 2 | - /* 聊天气泡 */ | ||
| 3 | .head-icon { | 2 | .head-icon { |
| 4 | height: 90px; | 3 | height: 90px; |
| 5 | width: 90px; | 4 | width: 90px; |
| @@ -26,12 +25,6 @@ | @@ -26,12 +25,6 @@ | ||
| 26 | font-size: 28px; | 25 | font-size: 28px; |
| 27 | word-break: break-all; | 26 | word-break: break-all; |
| 28 | border-radius: 10px; | 27 | border-radius: 10px; |
| 29 | - | ||
| 30 | - &.msg-pic { | ||
| 31 | - } | ||
| 32 | - | ||
| 33 | - &.msg-order { | ||
| 34 | - } | ||
| 35 | } | 28 | } |
| 36 | 29 | ||
| 37 | .msg-txt { | 30 | .msg-txt { |
| @@ -125,10 +118,6 @@ | @@ -125,10 +118,6 @@ | ||
| 125 | } | 118 | } |
| 126 | } | 119 | } |
| 127 | 120 | ||
| 128 | - /*.send-msg-status { | ||
| 129 | - | ||
| 130 | - }*/ | ||
| 131 | - | ||
| 132 | .recevied-msg { | 121 | .recevied-msg { |
| 133 | .head-icon { | 122 | .head-icon { |
| 134 | float: left; | 123 | float: left; |
-
Please register or login to post a comment