fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit f0a315a09c4159c43509ca6863dfd5971b2ab5cd 2 parents a8c20ca0 b386c6db

Merge remote-tracking branch 'origin/feature/indexcss' into feature/webpack2

Inline Side-by-side
Showing 62 changed files with 483 additions and 1040 deletions
<div class="brand-page yoho-page">
{{# channel}}
<div class="genderNav">
<div class="gender-nav">
<ul>
{{# channels}}
<li {{#if active}}class="active"{{/if}} data-id="{{@index}}" data-name="{{channelName}}">
... ... @@ -33,7 +33,7 @@
{{/ hotBrandsScroll}}
{{/ topData}}
<div class="brandNav">
<div class="brand-nav">
<ul>
<li class="allbrand active" data-id="0">
<span>{{brandType}}</span>
... ...
<section class='app_update'>
<section class='app-update'>
<button>立即升级</button>
</section>
\ No newline at end of file
... ...
... ... @@ -47,7 +47,7 @@
"request": "^2.81.0",
"request-promise": "^3.0.0",
"serve-favicon": "^2.4.0",
"uuid": "^2.0.3",
"uuid": "^3.0.1",
"xml2js": "^0.4.17",
"yoho-express-session": "^2.0.0",
"yoho-node-lib": "^0.2.8",
... ...
... ... @@ -17,8 +17,8 @@ let $brandList,
$newBrandWall,
$recommandBrandWall,
$icon = $('.search-icon'),
$genderItem = $('.genderNav li'),
$brandItem = $('.brandNav li'),
$genderItem = $('.gender-nav li'),
$brandItem = $('.brand-nav li'),
$searchAction = $('.search-action'),
$homebuttom = $('.homebuttom'),
$newSearch = $('.newbrand-search'),
... ... @@ -258,7 +258,7 @@ function searchResult() {
(function() {
if ($('.banner-top').length === 0) {
let h1 = $('.genderNav').height();
let h1 = $('.gender-nav').height();
let h2 = $('.newbrand-search').height();
$('.hot-brands').css('padding-top', (h1 + h2) + 'px');
... ... @@ -295,7 +295,7 @@ function searchResult() {
$brandItem.on('click', function() {
let index = $(this).data('id');
$('.brandNav ul .active').removeClass('active');
$('.brand-nav ul .active').removeClass('active');
$(this).addClass('active');
if (index === 0) {
$recommandBrandWall.not('.hide').addClass('hide');
... ...
var $ = require('yoho-jquery');
// $('body').height($(window).height());
// $('.app_update').height($(window).height()).width($(window).width());
// $('.app-update').height($(window).height()).width($(window).width());
$('button').on('click', function() {
window.location = 'http://www.yohoshow.com/about/index/yohobuyqr';
... ...
... ... @@ -4,43 +4,6 @@
max-width: 640px;
overflow: hidden;
.banner-top {
position: relative;
margin-bottom: -2PX;
.swiper-pagination {
position: absolute;
left: 0;
right: 0;
bottom: 20px;
text-align: center;
z-index: 1;
.pagination-inner {
display: inline-block;
padding: 0 8px 4px;
background: rgba(0, 0, 0, 0.2);
border-radius: 50px;
line-height: 1.2;
span {
display: inline-block;
width: 14px;
height: 14px;
background: #fff;
opacity: 0.5;
margin: 0 9px;
border-radius: 50%;
&.swiper-pagination-bullet-active {
background: #fff;
opacity: 1;
}
}
}
}
}
.swiper-slide {
img {
max-width: 640px;
... ... @@ -49,6 +12,43 @@
}
}
.coupon-area-page .banner-top {
position: relative;
margin-bottom: -2PX;
.swiper-pagination {
position: absolute;
left: 0;
right: 0;
bottom: 20px;
text-align: center;
z-index: 1;
.pagination-inner {
display: inline-block;
padding: 0 8px 4px;
background: rgba(0, 0, 0, 0.2);
border-radius: 50px;
line-height: 1.2;
span {
display: inline-block;
width: 14px;
height: 14px;
background: #fff;
opacity: 0.5;
margin: 0 9px;
border-radius: 50%;
&.swiper-pagination-bullet-active {
background: #fff;
opacity: 1;
}
}
}
}
}
.just-img {
width: 100%;
float: left;
... ... @@ -196,4 +196,4 @@
height: 56px;
text-align: center;
}
}
\ No newline at end of file
}
... ...
... ... @@ -176,7 +176,7 @@
display: inline-block;
width: 139px;
height: 42px;
align: center;
text-align: center;
font-size: 24px;
color: #fff;
margin: 0 40%;
... ...
... ... @@ -23,10 +23,6 @@
margin-bottom: 10px;
}
.intro-title {
// margin-top: 90px;
}
/* 手机号 领福利 */
.invite-content-page {
text-align: center;
color: #fff;
... ...
@import "coupon-floor";
\ No newline at end of file
@import "coupon-floor";
... ...
... ... @@ -274,9 +274,6 @@
color: #b0b0b0;
overflow: hidden;
white-space: nowrap;
color: #b0b0b0;
overflow: hidden;
white-space: nowrap;
}
span.disabled {
... ...
... ... @@ -92,6 +92,7 @@
&:before {
content: "编辑";
}
display: none;
width: 100px;
height: 60px;
... ...
... ... @@ -203,14 +203,14 @@
li {
border-bottom: 1px solid #fff;
padding: 0 40px;
}
&:last-child {
border-bottom: none;
}
li > i {
float: right;
}
i {
float: right;
}
li:last-child {
border-bottom: none;
}
li.dispatch-time-info {
... ... @@ -318,9 +318,9 @@
width: 100%;
height: 100%;
background: #000;
filter: alpha(opacity=70); /*IE滤镜，透明度70%*/
-moz-opacity: 0.7; /*Firefox私有，透明度70%*/
opacity: 0.7;/*其他，透明度70%*/
filter: alpha(opacity=70);
-moz-opacity: 0.7;
opacity: 0.7;
}
span {
... ... @@ -401,7 +401,6 @@
.name {
font-size: 32px;
max-width: 70%;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
... ...
.pay-back-page {
font-family: helvetica,Arial,黑体;
font-family: helvetica, Arial, 黑体;
.failure-order {
margin-top: 140px;
... ... @@ -24,4 +24,4 @@
margin-right: 10px;
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -70,11 +70,13 @@
&:before {
@extend line;
left: 60px;
}
&:after {
@extend line;
right: 60px;
}
}
... ...
@import "gift-advance-good";
@import "chose-panel";
\ No newline at end of file
@import "chose-panel";
... ...
... ... @@ -3,4 +3,4 @@
@import "product/detail/recommend-for-you";
@import "common/good";
@import "layout/loading";
@import "chose-panel";
\ No newline at end of file
@import "chose-panel";
... ...
... ... @@ -36,17 +36,17 @@
opacity: 0.5;
margin: 0 9px;
border-radius: 50%;
}
&.swiper-pagination-bullet-active {
background: #fff;
opacity: 1;
}
.swiper-pagination-bullet-active {
background: #fff;
opacity: 1;
}
}
}
}
.genderNav {
.gender-nav {
display: block;
width: 100%;
height: 40PX;
... ... @@ -109,7 +109,7 @@
}
}
.brandNav {
.brand-nav {
display: block;
width: 100%;
line-height: 80px;
... ...
... ... @@ -81,4 +81,4 @@
}
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -201,4 +201,4 @@
}
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -12,4 +12,4 @@
height: 180px;
width: 186px;
}
}
\ No newline at end of file
}
... ...
... ... @@ -95,4 +95,4 @@
color: #c5c5c5;
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -92,4 +92,4 @@
color: #b0b0b0;
}
}
}
\ No newline at end of file
}
... ...
/*.search-page {
.search-input {
position: relative;
padding: 14px 22px;
background: #f8f8f8;
form {
width: 100%;
}
.search-icon {
position: absolute;
font-size: 24px;
top: 26px;
left: 36px;
color: #b2b2b2;
}
input {
height: 56px;
width: 378px;
border-radius: 28px;
padding: 0 52px;
font-size: 24px;
background: #fff;
border: none;
}
.clear-input {
position: absolute;
top: 20px;
right: 145px;
font-size: 32px;
color: #666;
}
.search {
position: absolute;
top: 18px;
right: 40px;
border: none;
background: transparent;
color: #666;
font-size: 30px;
line-height: 56px;
}
}
.search-items {
padding: 40px 20px;
h3 {
font-size: 24px;
margin-bottom: 20px;
}
li {
float: left;
margin-right: 20px;
margin-bottom: 20px;
max-width: 100%;
overflow: hidden;
}
a {
display: block;
height: 68px;
line-height: 68px;
padding: 0 20px;
font-size: 28px;
background: #f8f8f8;
color: #000;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.clear-icon {
float: right;
background: #fff;
}
span {
margin-right: 5px;
}
.search-group {
.ico-hot {
width: 22px;
height: 30px;
display: inline-block;
background: url('/search/hot-ico.png') no-repeat;
margin-right: 20px;
position: relative;
top: 2px;
}
h3 {
color: #b0b0b0;
font-size: 28px;
}
}
.search-content-title {
height: 40px;
.ico-lately {
width: 26px;
height: 26px;
display: inline-block;
background: url('/search/time-ico.png') no-repeat;
margin-right: 20px;
position: relative;
top: 2px;
}
.ico-del {
width: 24px;
height: 26px;
display: inline-block;
background: url('/search/del-ico.png') no-repeat;
}
.left {
float: left;
}
.right {
float: right;
}
}
.search-content{
clear: both;
box-sizing: border-box;
padding-bottom: 18px;
a {
border-radius: 8px;
border: 2px solid #b0b0b0;
background: #fff;
color: #b0b0b0;
font-size: 28px;
}
}
.hot-search {
margin-top: 38px;
}
}
}*/
.search-associate {
width: 100%;
background: #f8f8f8;
... ... @@ -299,4 +147,4 @@
font-size: 24px;
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -8,4 +8,4 @@
float: left;
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -103,4 +103,4 @@
transform-origin: 50% 0 0;
margin-top: 0;
}
}
\ No newline at end of file
}
... ...
.side-nav {
display: none;
background: #fff;
position: fixed;
top: 0;
bottom: 0;
... ...
... ... @@ -73,4 +73,4 @@
}
}
}
}
\ No newline at end of file
}
... ...
@import "brand";
\ No newline at end of file
@import "brand";
... ...
.data-bind {
display: none !important;
}
\ No newline at end of file
}
... ...
/* dialog */
.dialog-wrapper {
background: hsla(0, 0%, 0%, 0.5);
position: fixed;
... ... @@ -55,8 +54,7 @@
}
}
/*边框在物理机上1px变粗*/
.dialog-footer::before {
.dialog-footer:before {
content: "";
position: absolute;
left: 0;
... ... @@ -65,7 +63,5 @@
border-top: 1px solid #ccc;
transform-origin: left top;
transform: scale3d(0.5, 0.5, 0.5);
-webkit-transform: scale3d(0.5, 0.5, 0.5); /* Chrome, Safari, Opera */
-ms-transform: scale3d(0.5, 0.5, 0.5); /* IE 9 */
}
}
... ...
... ... @@ -20,4 +20,4 @@
color: #fff;
font-size: 36px;
}
}
\ No newline at end of file
}
... ...
... ... @@ -51,7 +51,7 @@ body {
color: #333;
text-align: center;
font-size: 12px;
font-family: helvetica,Arial,黑体;
font-family: helvetica, Arial, 黑体;
}
ul,
... ... @@ -119,7 +119,6 @@ body {
display: none;
}
/*顶悬浮*/
&.fixnav {
position: fixed;
top: 0;
... ... @@ -151,33 +150,3 @@ body {
height: 100%;
}
}
/*弹窗*/
.tc_box {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
margin: 0 auto;
display: none;
z-index: 1000;
}
.tc_bg {
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
margin: 0 auto;
z-index: 1001;
}
.tc_con {
position: fixed;
top: 50%;
left: 3.9%;
width: 92.2%;
margin-top: -200px;
z-index: 1000000;
display: block;
}
\ No newline at end of file
... ...
... ... @@ -195,4 +195,4 @@
margin: 0 auto;
}
}
}
\ No newline at end of file
}
... ...
@charset "utf-8";
/* CSS Document */
/**
* Swiper 3.1.7
* Most modern mobile touch slider and framework with hardware accelerated transitions
*
*
* http://www.idangero.us/swiper/
*
*
* Copyright 2015, Vladimir Kharlampidi
* The iDangero.us
* http://www.idangero.us/
*
*
* Licensed under MIT
*
*
* Released on: October 10, 2015
*/
.swiper-container {
margin: 0 auto;
position: relative;
overflow: hidden;
/*z-index: 1*/
}
.swiper-container-no-flexbox .swiper-slide {
... ...
.blk-cate-all {
font-size: 15PX;
.category-nav {
height: 80px;
border-bottom: 1px solid #e6e6e6;
width: 100%;
background: #fff;
z-index: 10;
li {
display: block;
box-sizing: border-box;
float: left;
height: 100%;
padding: 20px 0;
width: 50%;
text-align: center;
color: #999;
&:last-child {
border-right: none;
}
&.focus {
color: #000;
}
&.bytouch {
background: #eee;
}
}
span {
display: block;
width: 100%;
height: 30px;
line-height: 30px;
font-size: 80%;
}
}
.loca {
position: fixed;
top: 88px;
}
.content {
overflow: hidden;
position: relative;
&.hide {
display: none;
}
}
.living {
margin-top: 160px;
}
.primary-level {
float: left;
box-sizing: border-box;
width: 45%;
> li {
height: 89px;
line-height: 89px;
padding: 0 32px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border-bottom: 1px solid #e6e6e6;
&.focus {
background-color: #fff;
}
&.highlight {
background-color: #eee;
}
}
}
.trilanglefont {
font-family: "iconfont" !important;
font-size: 30px;
font-style: normal;
text-decoration: none;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale;
color: #f4f4f4;
}
.primary-level-trilangle {
float: right;
background-image: url(/product/arrow.png) no-repeat;
margin-top: 22px;
width: 20px;
height: 46px;
position: relative;
right: -32px;
}
.sub-level-container {
float: left;
overflow-x: auto;
box-sizing: border-box;
background: #fff;
width: 55%;
height: 100%;
background: #f4f4f4;
}
.sub-level {
width: 100%;
height: 100%;
&.hide {
display: none;
}
> li {
box-sizing: border-box;
height: 79px;
line-height: 79px;
border-bottom: 1px solid #e6e6e6;
padding-left: 20px;
&.highlight {
background: #eee;
}
&:last-child {
border-bottom: none;
}
}
a {
display: block;
height: 100%;
width: 100%;
color: #afafaf;
}
}
}
... ... @@ -27,7 +27,7 @@
&:link,
&:visited,
&:hover,
&:actived {
&:active {
color: #000;
}
}
... ... @@ -681,7 +681,6 @@
font-size: 24px;
text-align: center;
line-height: 50px;
/*display: none;*/
}
}
... ... @@ -808,7 +807,6 @@
.forward {
width: 40px;
height: 28px;
position: absolute;
right: 23px;
margin-left: 45px;
... ... @@ -1035,4 +1033,4 @@
}
}
}
}
\ No newline at end of file
}
... ...
@import "common/good";
@import 'channel/floor-header';
@import './info';
@import './tvls';
@import './plus-star';
@import "channel/floor-header";
@import "./info";
@import "./tvls";
@import "./plus-star";
... ...
@import "layout/swiper";
@import './plus-star';
@import "./plus-star";
... ...
... ... @@ -9,32 +9,32 @@
border-bottom: 1px solid #e0e0e0;
color: #b0b0b0;
font-size: 26px;
}
li {
width: 50%;
height: 100%;
float: left;
text-align: center;
.fav-tab > li {
width: 50%;
height: 100%;
float: left;
text-align: center;
&.active {
color: #444;
}
&.active {
color: #444;
}
&:nth-last-of-type(1) {
float: right;
position: relative;
&:after {
content: "";
display: block;
width: 1px;
height: 44px;
position: absolute;
left: 0;
top: 22px;
background: #b0b0b0;
}
}
&:nth-last-of-type(1) {
float: right;
position: relative;
}
&:nth-last-of-type(1):after {
content: "";
display: block;
width: 1px;
height: 44px;
position: absolute;
left: 0;
top: 22px;
background: #b0b0b0;
}
}
... ... @@ -47,24 +47,6 @@
display: block;
}
.fav-null {
font-size: 22px;
color: #444;
display: block;
margin-top: 100px;
text-align: center;
&:before {
content: "";
display: block;
width: 188px;
height: 171px;
background: resolve("home/fav/fav-null.png");
background-size: 100% 100%;
margin: 0 auto 45px;
}
}
.go-shopping {
width: 472px;
height: 88px;
... ... @@ -77,252 +59,264 @@
font-size: 26px;
border-radius: 0.2rem;
}
}
.fav-product-list {
list-style: none;
margin-left: 30px;
.fav-content .fav-null {
font-size: 22px;
color: #444;
display: block;
margin-top: 100px;
text-align: center;
li {
height: auto;
overflow: hidden;
margin-top: 20px;
}
&:before {
content: "";
display: block;
width: 188px;
height: 171px;
background: resolve("home/fav/fav-null.png");
background-size: 100% 100%;
margin: 0 auto 45px;
}
}
.fav-img-box {
width: 90px;
height: 120px;
float: left;
margin-right: 24px;
img {
display: block;
overflow: hidden;
width: 100%;
height: 100%;
}
}
.fav-content .fav-product-list {
list-style: none;
margin-left: 30px;
.fav-info-list {
color: #444;
font-size: 24px;
border-bottom: 1px solid #e0e0e0;
padding-bottom: 20px;
height: 140px;
overflow: hidden;
position: relative;
li {
height: auto;
overflow: hidden;
margin-top: 20px;
}
h2 {
width: 430px;
text-overflow: ellipsis;
}
.fav-img-box {
width: 90px;
height: 120px;
float: left;
margin-right: 24px;
}
.fav-price {
.new-price {
color: #d1021c;
}
.fav-img-box img {
display: block;
overflow: hidden;
width: 100%;
height: 100%;
}
.price-underline {
text-decoration: line-through;
margin-left: 15px;
color: #b0b0b0;
}
}
.fav-info-list {
color: #444;
font-size: 24px;
border-bottom: 1px solid #e0e0e0;
padding-bottom: 20px;
height: 140px;
overflow: hidden;
position: relative;
}
.save-price {
position: absolute;
bottom: 20px;
left: 0;
width: 100%;
min-height: 24px;
&.save-price-number {
text-indent: 42px;
color: #b0b0b0;
padding-top: 3px;
&:before {
content: "";
display: block;
background: url("/home/fav/save-price.png");
width: 32px;
height: 32px;
position: absolute;
top: 50%;
left: 0;
margin-top: -16px;
}
span {
margin-left: 15px;
}
.del-fav {
text-indent: 0;
margin-left: 0;
}
}
span {
color: #d1021c;
&.sell-out {
padding: 5px 18px;
color: #fffefe;
border-radius: 20px;
background: #7f7f7f;
font-size: 22px;
}
&.del-fav {
width: 2rem;
height: 1.5rem;
line-height: 1.5rem;
position: absolute;
top: 50%;
margin-top: -0.75rem;
right: 0;
color: #999;
padding-right: 0.75rem;
text-align: right;
}
}
}
}
.fav-info-list h2 {
width: 430px;
text-overflow: ellipsis;
}
.fav-info-list .fav-price .new-price {
color: #d1021c;
}
/*品牌收藏*/
.fav-info-list .fav-price .price-underline {
text-decoration: line-through;
margin-left: 15px;
color: #b0b0b0;
}
.fav-info-list .save-price {
position: absolute;
bottom: 20px;
left: 0;
width: 100%;
min-height: 24px;
}
.fav-info-list .save-price span {
color: #d1021c;
}
.fav-info-list .save-price .sell-out {
padding: 5px 18px;
color: #fffefe;
border-radius: 20px;
background: #7f7f7f;
font-size: 22px;
}
.fav-brand-swiper {
.fav-info-list .save-price .del-fav {
width: 2rem;
height: 1.5rem;
line-height: 1.5rem;
position: absolute;
top: 50%;
margin-top: -0.75rem;
right: 0;
color: #999;
padding-right: 0.75rem;
text-align: right;
}
.fav-info-list .save-price-number {
text-indent: 42px;
color: #b0b0b0;
padding-top: 3px;
}
.fav-info-list .save-price-number:before {
content: "";
display: block;
background: url("/home/fav/save-price.png");
width: 32px;
height: 32px;
position: absolute;
top: 50%;
left: 0;
margin-top: -16px;
}
.fav-info-list .save-price-number span {
margin-left: 15px;
}
.fav-info-list .save-price-number .del-fav {
text-indent: 0;
margin-left: 0;
}
}
.fav-content .fav-brand-swiper {
border-top: 1px solid #e0e0e0;
border-bottom: 28px solid #f0f0f0;
position: relative;
&:nth-of-type(1) {
border-top: 0;
}
&:after {
content: "";
position: absolute;
left: 0;
bottom: -2px;
border-top: 1px solid #e0e0e0;
border-bottom: 28px solid #f0f0f0;
position: relative;
display: block;
width: 100%;
height: 1px;
}
}
&:nth-of-type(1) {
border-top: 0;
}
.fav-content .fav-brand-swiper .swiper-header {
height: 100px;
padding: 20px 30px;
display: inline-block;
position: relative;
width: 100%;
box-sizing: border-box;
&:after {
content: "";
position: absolute;
left: 0;
bottom: -2px;
border-top: 1px solid #e0e0e0;
display: block;
width: 100%;
height: 1px;
.swiper-logo {
height: 100%;
display: inline-block;
float: left;
margin-right: 45px;
}
.swiper-logo > img {
max-height: 100%;
vertical-align: middle;
}
.brand-info {
float: left;
.brand-name {
font-size: 28px;
b {
color: #b0b0b0;
font-weight: normal;
}
}
.swiper-header {
height: 100px;
padding: 20px 30px;
display: inline-block;
position: relative;
width: 100%;
box-sizing: border-box;
.swiper-logo {
height: 100%;
display: inline-block;
float: left;
margin-right: 45px;
> img {
max-height: 100%;
vertical-align: middle;
}
.brand-update {
font-size: 22px;
b {
color: #b0b0b0;
font-weight: normal;
}
.brand-info {
float: left;
.brand-new {
color: #86bf4a;
margin-right: 24px;
}
.brand-name {
font-size: 28px;
.brand-discount {
color: #d1021c;
}
}
}
.fav-more {
width: 2.5rem;
height: 2.5rem;
position: absolute;
top: 0;
right: 0;
&:after {
background: url("/home/fav/fav-more.png");
width: 18px;
height: 29px;
position: absolute;
top: 50%;
right: 30px;
margin-top: -15px;
content: "";
}
}
}
b {
color: #b0b0b0;
font-weight: normal;
}
}
.fav-content .fav-brand-swiper .swiper-container {
height: 365px;
margin: 0 30px;
.brand-update {
font-size: 22px;
.swiper-slide {
width: 255px;
height: 100%;
float: left;
padding-right: 30px;
b {
color: #b0b0b0;
font-weight: normal;
}
&:nth-last-of-type(1) {
padding-right: 0;
}
.brand-new {
color: #86bf4a;
margin-right: 24px;
}
img {
display: block;
width: 100%;
height: 300px;
overflow: hidden;
}
.brand-discount {
color: #d1021c;
}
}
}
.brand-product {
height: 65px;
line-height: 65px;
text-align: center;
font-size: 22px;
.fav-more {
width: 2.5rem;
height: 2.5rem;
position: absolute;
top: 0;
right: 0;
&:after {
background: url("/home/fav/fav-more.png");
width: 18px;
height: 29px;
position: absolute;
top: 50%;
right: 30px;
margin-top: -15px;
content: "";
}
.price-discount span {
color: #d1021c;
}
}
.swiper-container {
height: 365px;
margin: 0 30px;
.swiper-slide {
width: 255px;
height: 100%;
float: left;
padding-right: 30px;
&:nth-last-of-type(1) {
padding-right: 0;
}
img {
display: block;
width: 100%;
height: 300px;
overflow: hidden;
}
.brand-product {
height: 65px;
line-height: 65px;
text-align: center;
font-size: 22px;
.price-discount {
span {
color: #d1021c;
}
b {
color: #b0b0b0;
text-decoration: line-through;
font-weight: normal;
margin-left: 13px;
}
}
}
.price-discount b {
color: #b0b0b0;
text-decoration: line-through;
font-weight: normal;
margin-left: 13px;
}
}
}
... ...
... ... @@ -43,7 +43,7 @@
}
}
.deal_main {
.deal-main {
margin: 0.5rem 3%;
font-size: 14.4PX;
width: 94%;
... ...
... ... @@ -30,38 +30,38 @@
.ticket-btn {
width: 580px;
}
.ticket-btn-c {
width: 420px;
border-top: solid 1px #e0e0e0;
clear: both;
margin: 55px auto 0;
.ticket-btn .ticket-btn-c {
width: 420px;
border-top: solid 1px #e0e0e0;
clear: both;
margin: 55px auto 0;
div {
width: 200px;
margin: -25px auto 0;
height: 54px;
background-color: #fff;
a {
width: 152px;
height: 50px;
border: solid 2px #d0021b;
color: #fff;
font-size: 24px;
display: block;
text-align: center;
line-height: 50px;
border-radius: 25px;
margin: 0 auto;
background-color: #d0021b;
}
div {
width: 200px;
margin: -25px auto 0;
height: 54px;
background-color: #fff;
a {
width: 152px;
height: 50px;
border: solid 2px #d0021b;
color: #fff;
font-size: 24px;
display: block;
text-align: center;
line-height: 50px;
border-radius: 25px;
margin: 0 auto;
background-color: #d0021b;
}
.disable {
background-color: #b0b0b0;
color: #fff;
border-color: #b0b0b0;
}
.disable {
background-color: #b0b0b0;
color: #fff;
border-color: #b0b0b0;
}
}
}
... ... @@ -174,65 +174,65 @@
.ticket-list {
padding-top: 30px;
}
.ticket {
margin-bottom: 30px;
width: 580px;
.ticket-list .ticket {
margin-bottom: 30px;
width: 580px;
height: 168px;
background-image: resolve("home/employ/employ2.png");
background-position: top center;
background-repeat: no-repeat;
background-size: 100% 100%;
.left {
width: 200px;
height: 168px;
background-image: resolve("home/employ/employ2.png");
background-position: top center;
background-repeat: no-repeat;
background-size: 100% 100%;
.left {
width: 200px;
height: 168px;
color: #fff;
font-size: 90px;
line-height: 168px;
text-align: center;
float: left;
overflow: hidden;
color: #fff;
font-size: 90px;
line-height: 168px;
text-align: center;
float: left;
overflow: hidden;
span {
float: left;
margin-left: 10px;
font-size: 50px;
}
span {
float: left;
margin-left: 10px;
font-size: 50px;
}
div {
overflow: hidden;
}
div {
overflow: hidden;
}
}
.right {
width: 270px;
padding: 30px 0;
height: 168px;
float: left;
.right {
width: 270px;
padding: 30px 0;
height: 168px;
float: left;
.first {
width: 240px;
overflow: hidden;
font-size: 26px;
line-height: 40px;
height: 80px;
}
p {
font-size: 18px;
color: #fff;
line-height: 30px;
}
.first {
width: 240px;
overflow: hidden;
font-size: 26px;
line-height: 40px;
height: 80px;
}
.btn {
width: 110px;
height: 168px;
float: left;
display: block;
p {
font-size: 18px;
color: #fff;
line-height: 30px;
}
}
.btn {
width: 110px;
height: 168px;
float: left;
display: block;
}
}
}
}
... ...
... ... @@ -167,6 +167,7 @@
.question {
@extend qa;
position: relative;
color: #000;
... ...
... ... @@ -304,7 +304,6 @@
.name {
font-size: 28px;
max-width: 70%;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
... ...
... ... @@ -17,6 +17,7 @@
height: 100px;
line-height: 100px;
}
height: 80px;
border-bottom: 1px solid #e0e0e0;
... ... @@ -31,6 +32,7 @@
&:first-of-type {
color: #444;
}
width: 42%;
height: 100%;
line-height: 80px;
... ... @@ -56,21 +58,21 @@
overflow: hidden;
display: block;
position: relative;
}
i {
width: 72px;
height: 32px;
overflow: hidden;
display: block;
position: absolute;
right: 40px;
top: 50%;
transform: translateY(-50%);
}
.grade i {
width: 72px;
height: 32px;
overflow: hidden;
display: block;
position: absolute;
right: 40px;
top: 50%;
transform: translateY(-50%);
}
span {
color: #b0b0b0;
}
.grade span {
color: #b0b0b0;
}
.vip-3 {
... ...
.my-coupon-page {
.coupon-tab {
height: 90px;
padding: 25px 0;
text-align: center;
background-color: #fff;
font-size: 32px;
color: #b0b0b0;
ul li {
float: left;
width: 50%;
border-right: 1px solid #b0b0b0;
&.activate {
color: #444;
}
&:last-child {
border: none;
}
}
}
.coupon-group {
background-color: #f2f2f2;
color: #f2f2f2;
margin: 20px 20px 0;
& > div {
padding: 0 15px;
}
.coupon-header {
border-radius: 10px 10px 0 0;
background-color: #e53333;
height: 60px;
line-height: 60px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 28px;
}
.coupon-content {
border-radius: 0 0 10px 10px;
height: 140px;
border-top: 2px dashed #e53333;
display: table;
padding: 15px 0;
background-color: #f06a6b;
.coupon-content-group1 {
display: table-cell;
text-align: center;
vertical-align: middle;
font-size: 20px;
p {
width: 200px;
overflow: hidden;
min-height: 28px;
}
.coupon-money {
font-size: 80px;
}
}
.coupon-content-group2 {
display: table-cell;
font-size: 20px;
border-left: 1px solid #f1aeaf;
padding-left: 20px;
padding-right: 20px;
width: 100%;
.coupon-content-group2-table {
display: table;
overflow: hidden;
height: 100%;
width: 100%;
line-height: 45px;
}
.coupon-content-group2-table > div {
display: table-row;
height: 100%;
}
.left {
float: left;
line-height: 45px;
color: #fff;
}
.left.down .iconfont:before {
font-size: 12px;
content: "\e609";
}
.left.up .iconfont:before {
font-size: 12px;
content: "\e608";
}
.right {
float: right;
}
.coupon-soon-expire {
color: #000;
}
.btn {
display: inline-block;
width: 120px;
height: 45px;
text-align: center;
background-color: #e53333;
border-radius: 10px;
color: #fff;
}
.employ {
width: 171px;
height: 146px;
position: absolute;
display: block;
z-index: 2;
right: 37px;
margin-top: -95px;
background-image: resolve("home/employ.png");
background-size: cover;
}
}
}
.coupon-footer {
background-color: #f06a6b;
padding: 20px;
font-size: 18px;
border-radius: 10px;
color: #fff;
border-top: 1px dashed #fff;
}
}
.coupon-not-result {
width: 100%;
height: auto;
overflow: hidden;
position: fixed;
left: 0;
top: 50%;
margin-top: -162px;
i {
width: 100%;
height: 120px;
overflow: hidden;
display: block;
background: resolve("home/employ/not.png") center top no-repeat;
background-size: auto 100%;
}
p {
width: 100%;
height: auto;
overflow: hidden;
padding: 20px 0 0;
font-size: 32px;
text-align: center;
color: #444;
}
a {
width: 73.75%;
height: 80px;
overflow: hidden;
font-size: 36px;
line-height: 80px;
display: block;
background: #444;
color: #fff;
text-align: center;
margin: 60px auto 0;
border-radius: 0.2rem;
}
}
}
@import "coupons";
... ...
@import "favorite";
\ No newline at end of file
@import "favorite";
... ...
@import "layout/swiper";
@import "order";
@import "order-detail";
\ No newline at end of file
@import "order-detail";
... ...
@import 'order';
@import 'layout/swiper';
@import "order";
@import "layout/swiper";
... ...
@import 'common/dialog';
@import './browse-record';
@import "common/dialog";
@import "./browse-record";
... ...
... ... @@ -196,4 +196,4 @@ button {
}
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -103,9 +103,6 @@
z-index: 9999;
display: block;
}
&.animation {
}
}
.copyright {
... ... @@ -204,7 +201,7 @@
&:link,
&:visited,
&:hover,
&:actived {
&:active {
color: #000;
}
}
... ... @@ -212,7 +209,7 @@
.circle-rightbottom {
position: absolute;
width: 25PX;
height: 0PX;
height: 0;
border: 0 solid #323232;
border-bottom: 25PX solid #323232;
border-radius: 0 0 25PX;
... ...
... ... @@ -79,22 +79,26 @@
.nav-back {
@extend nav;
left: 10px;
}
.nav-home {
@extend nav;
right: 10px;
}
.nav-btn {
@extend nav;
right: 10px;
font-size: 14PX;
}
.nav-sub-right {
@extend nav;
right: 100px;
}
... ...
/* ======================= *\
Module: 图片旋转验证
Module: 图片旋转验证
\* ======================= */
.img-check {
margin-top: 45px;
... ... @@ -35,23 +35,3 @@
height: 150px;
}
}
#js-img-check {
&.hide {
display: none !important;
}
&.popup {
display: flex;
align-items: center;
justify-content: center;
position: fixed;
width: 100%;
height: 100%;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: 99;
background-color: rgba(0, 0, 0, 0.3);
}
}
\ No newline at end of file
... ...
... ... @@ -57,6 +57,7 @@
}
$init: calc(($i + 1) * 0.12);
}
display: inline-block;
margin: 4px;
width: 30px;
... ...
... ... @@ -29,4 +29,4 @@
position: absolute;
top: 0;
right: 30px;
}
\ No newline at end of file
}
... ...
... ... @@ -4,4 +4,4 @@
&.active {
display: block;
}
}
\ No newline at end of file
}
... ...
... ... @@ -7,4 +7,4 @@
.goods-container .yo-loading {
float: left;
width: 100%;
}
\ No newline at end of file
}
... ...
.app_update {
.app-update {
background: resolve("app-update.png");
background-size: 100% 100%;
width: 100%;
... ...
... ... @@ -298,4 +298,4 @@ body.passport-body {
color: #f41e1f;
}
}
}
\ No newline at end of file
}
... ...
... ... @@ -185,4 +185,4 @@
border-radius: 5PX;
}
}
}
\ No newline at end of file
}
... ...
/* 新品到着 css */
@import 'layout/panel';
@import 'layout/swiper';
@import 'layout/yo-loading';
@import 'common/filter';
@import 'common/good';
@import 'new/recommend';
@import 'new/handlepick';
@import 'new/good-tags';
@import 'new/brand-info';
@import 'new/brand-recommend';
@import 'new/article';
@import "layout/panel";
@import "layout/swiper";
@import "layout/yo-loading";
@import "common/filter";
@import "common/good";
@import "new/recommend";
@import "new/handlepick";
@import "new/good-tags";
@import "new/brand-info";
@import "new/brand-recommend";
@import "new/article";
body {
background-color: #f0f0f0;
}
.banner-swiper .swiper-slide {
.banner-swiper .swiper-slide {
height: 234px;
}
... ...
@import 'layout/panel';
@import 'new/recommend';
@import "layout/panel";
@import "new/recommend";
.main-wrap {
background-color: #f0f0f0;
... ... @@ -35,4 +35,4 @@
.new-brands .brand-news-count .count {
display: none;
}
\ No newline at end of file
}
... ...