fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit 734e28ba89ad5f81bcdd61a301a39854fa806965 2 parents 5e8eeee6 df5a61d9

Merge branch 'feature/home' into develop

Inline Side-by-side
Showing 6 changed files with 316 additions and 309 deletions
.yoho-favorite-page {
width: 100%;
height: auto;
.fav-content {
.fav-type {
display: block;
}
.fav-product-list {
padding-left: 20px;
list-style: none;
li {
height: 205px;
overflow: hidden;
margin-top: 20px;
}
.fav-del-left {
display: none;
float: left;
width: 50px;
height: 100%;
.fav-del-span {
display: inline-block;
width: 35px;
height: 35px;
margin-right: 15px;
margin-top: 80px;
background: resolve("home/fav/fav-del.png");
background-size: 100%;
}
}
.delshow {
display: block;
}
.fav-del-right {
position: absolute;
top: 0;
right: -126px;
background: #ff3b30;
width: 126px;
height: 200px;
text-align: center;
.fav-del-btn {
display: inline-block;
width: 35px;
height: 43px;
margin-top: 50px;
background: resolve("home/fav/fav-del-btn.png");
background-size: 100%;
}
.fav-del-txt {
font-size: 24px;
color: #fff;
}
}
.fav-img-box {
width: 152px;
height: 203px;
float: left;
margin-right: 24px;
img {
display: block;
overflow: hidden;
width: 100%;
height: 100%;
}
}
.fav-info-list {
color: #444;
font-size: 24px;
border-bottom: 1px solid #e0e0e0;
padding-bottom: 20px;
margin-right: 5px;
height: 203px;
overflow: hidden;
position: relative;
.title {
width: 430px;
text-overflow: ellipsis;
font-size: 28px;
margin: 0;
}
.fav-price {
margin-top: 20px;
}
.new-price {
color: #d1021c;
font-size: 24px;
}
.price-underline {
text-decoration: line-through;
margin-left: 15px;
color: #b0b0b0;
font-size: 24px;
}
.save-price {
position: absolute;
bottom: 20px;
left: 0;
width: 100%;
min-height: 24px;
}
.sell-out {
float: right;
padding: 5px 18px;
color: #b0b0b0;
border-radius: 20px;
font-size: 22px;
}
}
}
.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;
line-height: 88px;
margin: 80px auto 0;
background: #444;
text-align: center;
color: #fff;
display: block;
font-size: 26px;
border-radius: 0.2rem;
}
}
}
.yoho-favorite-brand-page {
width: 100%;
height: auto;
.fav-content {
.fav-type {
display: block;
}
.fav-brand-list {
padding-left: 20px;
list-style: none;
li {
height: 135px;
overflow: hidden;
margin-top: 20px;
border-bottom: 1px solid #e0e0e0;
}
.fav-del-left {
display: none;
float: left;
width: 50px;
height: 100%;
.fav-del-span {
display: inline-block;
width: 35px;
height: 35px;
margin-right: 15px;
margin-top: 50px;
background: resolve("home/fav/fav-del.png");
background-size: 100%;
}
}
.delshow {
display: block;
}
.fav-del-right {
position: absolute;
top: 0;
right: -126px;
background: #ff3b30;
width: 126px;
height: 125px;
text-align: center;
.fav-del-btn {
display: inline-block;
width: 35px;
height: 43px;
margin-top: 30px;
background: resolve("home/fav/fav-del-btn.png");
background-size: 100%;
}
.fav-del-txt {
font-size: 24px;
color: #fff;
}
}
.fav-img-box {
width: 160px;
height: 125px;
float: left;
margin-right: 24px;
img {
display: block;
overflow: hidden;
width: 100%;
height: 100%;
}
}
.fav-info-list {
color: #444;
font-size: 24px;
padding-bottom: 10px;
margin-right: 10px;
margin-top: 35px;
height: 100px;
overflow: hidden;
position: relative;
.title {
width: 430px;
color: #b0b0b0;
text-overflow: ellipsis;
font-size: 34px;
margin: 0;
}
}
span {
&.down {
float: right;
padding: 5px 18px;
color: #fffefe;
background: #b0b0b0;
border-radius: 20px;
font-size: 22px;
}
}
}
.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;
line-height: 88px;
margin: 80px auto 0;
background: #444;
text-align: center;
color: #fff;
display: block;
font-size: 26px;
border-radius: 0.2rem;
}
}
}
@import "home";
@import "help";
@import "feedback";
@import "fav";
@import "details";
@import "about-us";
@import "coin";
@import "logistics";
@import "exchange-status";
\ No newline at end of file
@import "exchange-status";
... ...
... ... @@ -117,3 +117,147 @@
};
</script>
<style>
.yoho-favorite-brand-page {
width: 100%;
height: auto;
.fav-content {
.fav-type {
display: block;
}
.fav-brand-list {
padding-left: 20px;
list-style: none;
li {
height: 135px;
overflow: hidden;
margin-top: 20px;
border-bottom: 1px solid #e0e0e0;
}
.fav-del-left {
display: none;
float: left;
width: 50px;
height: 100%;
.fav-del-span {
display: inline-block;
width: 35px;
height: 35px;
margin-right: 15px;
margin-top: 50px;
background: resolve("home/fav/fav-del.png");
background-size: 100%;
}
}
.delshow {
display: block;
}
.fav-del-right {
position: absolute;
top: 0;
right: -126px;
background: #ff3b30;
width: 126px;
height: 125px;
text-align: center;
.fav-del-btn {
display: inline-block;
width: 35px;
height: 43px;
margin-top: 30px;
background: resolve("home/fav/fav-del-btn.png");
background-size: 100%;
}
.fav-del-txt {
font-size: 24px;
color: #fff;
}
}
.fav-img-box {
width: 160px;
height: 125px;
float: left;
margin-right: 24px;
img {
display: block;
overflow: hidden;
width: 100%;
height: 100%;
}
}
.fav-info-list {
color: #444;
font-size: 24px;
padding-bottom: 10px;
margin-right: 10px;
margin-top: 35px;
height: 100px;
overflow: hidden;
position: relative;
.title {
width: 430px;
color: #b0b0b0;
text-overflow: ellipsis;
font-size: 34px;
margin: 0;
}
}
span {
&.down {
float: right;
padding: 5px 18px;
color: #fffefe;
background: #b0b0b0;
border-radius: 20px;
font-size: 22px;
}
}
}
.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;
line-height: 88px;
margin: 80px auto 0;
background: #444;
text-align: center;
color: #fff;
display: block;
font-size: 26px;
border-radius: 0.2rem;
}
}
}
</style>
... ...
... ... @@ -124,3 +124,166 @@
};
</script>
<style>
.yoho-favorite-page {
width: 100%;
height: auto;
.fav-content {
.fav-type {
display: block;
}
.fav-product-list {
padding-left: 20px;
list-style: none;
li {
height: 205px;
overflow: hidden;
margin-top: 20px;
}
.fav-del-left {
display: none;
float: left;
width: 50px;
height: 100%;
.fav-del-span {
display: inline-block;
width: 35px;
height: 35px;
margin-right: 15px;
margin-top: 80px;
background: resolve("home/fav/fav-del.png");
background-size: 100%;
}
}
.delshow {
display: block;
}
.fav-del-right {
position: absolute;
top: 0;
right: -126px;
background: #ff3b30;
width: 126px;
height: 200px;
text-align: center;
.fav-del-btn {
display: inline-block;
width: 35px;
height: 43px;
margin-top: 50px;
background: resolve("home/fav/fav-del-btn.png");
background-size: 100%;
}
.fav-del-txt {
font-size: 24px;
color: #fff;
}
}
.fav-img-box {
width: 152px;
height: 203px;
float: left;
margin-right: 24px;
img {
display: block;
overflow: hidden;
width: 100%;
height: 100%;
}
}
.fav-info-list {
color: #444;
font-size: 24px;
border-bottom: 1px solid #e0e0e0;
padding-bottom: 20px;
margin-right: 5px;
height: 203px;
overflow: hidden;
position: relative;
.title {
width: 430px;
text-overflow: ellipsis;
font-size: 28px;
margin: 0;
}
.fav-price {
margin-top: 20px;
}
.new-price {
color: #d1021c;
font-size: 24px;
}
.price-underline {
text-decoration: line-through;
margin-left: 15px;
color: #b0b0b0;
font-size: 24px;
}
.save-price {
position: absolute;
bottom: 20px;
left: 0;
width: 100%;
min-height: 24px;
}
.sell-out {
float: right;
padding: 5px 18px;
color: #b0b0b0;
border-radius: 20px;
font-size: 22px;
}
}
}
.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;
line-height: 88px;
margin: 80px auto 0;
background: #444;
text-align: center;
color: #fff;
display: block;
font-size: 26px;
border-radius: 0.2rem;
}
}
}
</style>
... ...
... ... @@ -64,3 +64,7 @@
};
</script>
<style>
@import "../../scss/home/_details.css";
</style>
... ...
... ... @@ -66,5 +66,8 @@
}
}
};
</script>
<style>
@import "../../scss/home/_logistics.css";
</style>
... ...