Authored by 梁志锋

merge App4.3

This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.

9.77 KB | W: | H:

9.87 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

17.3 KB | W: | H:

17.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -10,7 +10,9 @@
background-color: transparent;
z-index: 99;
}
.none{
display: none;
}
.checkbox {
position: absolute;
top: 50%;
... ...
... ... @@ -4,6 +4,10 @@
.icon-checkbox:before { content: "\e61c"; }
.icon-cb-checked:before { content: "\e61d"; }
.icon-radio:before { content: "\e647"; }
.icon-cb-radio:before { content: "\e646"; }
.shopping-cart-page {
margin-bottom: 120rem / $pxConvertRem;
overflow-x: hidden;
... ...
... ... @@ -10,91 +10,395 @@
}
.title {
font-size: 26rem / $pxConvertRem;
font-weight: bold;
font-size: 32rem / $pxConvertRem;
color: #444;
}
.address-wrap {
/*xwg 2016-3-19 10:53*/
.price-cost{
span{
color: #f00;
}
}
.border-none{
border-bottom:none !important;
}
.boys{
background:image-url('shopping-cart/boys.png') bottom left repeat-x #fff;
}
.girls{
background:image-url('shopping-cart/girls.png') bottom left repeat-x #fff;
}
.kids{
background:image-url('shopping-cart/kids.png') bottom left repeat-x #fff;
}
.life-style{
background:image-url('shopping-cart/lifeStyle.png') bottom left repeat-x #fff !important;
}
.not-address{
position: relative;
i{
position: absolute;
left: 16rem / $pxConvertRem;
top: 0%;
font-size: 44rem / $pxConvertRem;
}
.choose{
display: block;
color: #000;
height: 64rem / $pxConvertRem;
overflow: hidden;
position: static;
padding-left:40rem / $pxConvertRem;
font-size: 32rem / $pxConvertRem;
line-height: 82rem / $pxConvertRem;
span{
position: absolute;
right: 20rem / $pxConvertRem;
top: 28rem / $pxConvertRem;
font-size: 32rem / $pxConvertRem;
}
}
}
.address{
display: block;
position: relative;
margin-top: 0;
border-top: none;
padding-bottom:.8rem;
.info{
width: 90%;
height: auto;
overflow: hidden;
padding-left: 10%;
padding-bottom: 12rem / $pxConvertRem;
position: relative;
span{
display: inline-block;
}
i{
position: absolute;
left: 0;
top: 0%;
font-size: 44rem / $pxConvertRem;
}
}
.info-name{
width: 48%;
height: 40rem / $pxConvertRem;
font-size: 32rem / $pxConvertRem;
overflow: hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
.info-phone{
width: 48%;
font-size: 24rem / $pxConvertRem;
text-align: right;
}
.info-address{
width: 100%;
font-size: 24rem / $pxConvertRem;
line-height: 38rem / $pxConvertRem;
}
.rest{
position: absolute;
right: 32rem / $pxConvertRem;
bottom:20rem / $pxConvertRem;
color: #f00;
font-size: 24rem / $pxConvertRem;
span{
font-size: 24rem / $pxConvertRem;
}
}
}
.dispatch{
padding:0%;
margin:0;
.sub-block{
color: #444;
&:last-child h3{
border-bottom:none;
}
h3{
.hide{
display: none !important;
}
width: 95%;
height: 80rem / $pxConvertRem;
overflow: hidden;
line-height: 80rem / $pxConvertRem;
font-size: 32rem / $pxConvertRem;
margin-left: 5%;
border-bottom:1px solid #e0e0e0;
p{
display: inline-block;
height: 80rem / $pxConvertRem;
overflow: hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
i{
font-size: 36rem / $pxConvertRem;
margin-left: 8rem / $pxConvertRem;
height: 80rem / $pxConvertRem;
display: inline-block;
overflow: hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
span{
display: inline-block;
width: 65%;
height: 80rem / $pxConvertRem;
text-align: right;
font-size: 28rem / $pxConvertRem;
overflow: hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
}
ul{
width: 90%;
height:auto;
overflow: hidden;
line-height: 80rem / $pxConvertRem;
font-size: 28rem / $pxConvertRem;
background: #e0e0e0;
padding-left:10%;
display: none;
padding-bottom: 8rem / $pxConvertRem;
.right{
float: right;
margin-right: 40rem / $pxConvertRem;
}
li{
border-bottom:1px solid #fff;
&:last-child{
border-bottom:none;
}
}
}
}
> .iconfont {
}
.goods-num{
width: 100%;
height: 52rem / $pxConvertRem;
color: #b0b0b0;
background:#fff;
padding:20rem / $pxConvertRem 0;
text-align: right;
font-size: 28rem / $pxConvertRem;
line-height: 52rem / $pxConvertRem;
span{
padding-right:20rem / $pxConvertRem;
color: #f00;
}
}
.bill{
position: fixed;
background:#fff;
left: 0;
bottom: 0;
width: 96%;
height: 100rem / $pxConvertRem;
overflow: hidden;
line-height: 100rem / $pxConvertRem;
font-size: 28rem / $pxConvertRem;
padding-left: 4%;
span{
color: #f00;
}
a{
position: absolute;
color: #bcbcbc;
right: 20rem / $pxConvertRem;
top: 50%;
margin-top: -8px;
top: 10rem / $pxConvertRem;
background:#d0021b;
display: inline-block;
color: #fff;
width: 25%;
height: 80rem / $pxConvertRem;
overflow: hidden;
border-radius: 10rem / $pxConvertRem;
line-height: 80rem / $pxConvertRem;
text-align: center;
font-size: 30rem / $pxConvertRem;
}
.infos {
font-weight: bold;
font-size: 24rem / $pxConvertRem;
padding-right: 55rem / $pxConvertRem;
}
.price-cal{
margin-bottom: 90rem / $pxConvertRem;
font-size: 28rem / $pxConvertRem;
position: relative;
span{
position: absolute;
right: 28rem / $pxConvertRem;
text-align: right;
}
.per-info {
float: right;
li{
font-size: 28rem / $pxConvertRem;
p{
display: inline-block;
}
span{
display: inline-block;
}
}
}
.address {
display: block;
margin-top: 20rem / $pxConvertRem;
color: #bcbcbc;
font-weight: normal;
}
// .dispatch .sub-block:first-child {
// border-bottom: 1px solid #f7f7f7;
// margin-bottom: 15rem / $pxConvertRem;
// }
// .dispatch-mode li,
// .dispatch-time li {
// float: left;
// padding: 10rem / $pxConvertRem 20rem / $pxConvertRem;
// margin-right: 15rem / $pxConvertRem;
// margin-bottom: 15rem / $pxConvertRem;
// border: 1px solid #c9c9c9;
// color: #676767;
// font-size: 26rem / $pxConvertRem;
// &.chosed {
// border-color: #000;
// background: image-url('shopping-cart/black-right.png') no-repeat;
// background-size: 30rem / $pxConvertRem;
// background-position: bottom right;
// }
// }
// .goods {
// margin-right: -20rem / $pxConvertRem;
// .price-wrap {
// position: static;
// text-align: left;
// .price {
// color: #444;
// }
// .count {
// display: inline;
// margin-left: 20rem / $pxConvertRem;
// }
// }
// .name {
// max-width: pxToRem(400px);
// }
// }
.order-good {
position: relative;
padding: 20rem / $pxConvertRem 0;
margin-left: 34rem / $pxConvertRem;
height: 160rem / $pxConvertRem;
border-bottom: 1px solid #e0e0e0;
font-size: 26rem / $pxConvertRem;
&:last-child {
border-bottom: none;
}
.dispatch .title {
margin-bottom: 10rem / $pxConvertRem;
.thumb-wrap {
position: relative;
float: left;
width: 120rem / $pxConvertRem;
height: 160rem / $pxConvertRem;
}
.dispatch .sub-block:first-child {
border-bottom: 1px solid #f7f7f7;
margin-bottom: 15rem / $pxConvertRem;
.thumb {
width: 100%;
height: 100%;
}
.dispatch-mode li,
.dispatch-time li {
float: left;
padding: 10rem / $pxConvertRem 20rem / $pxConvertRem;
margin-right: 15rem / $pxConvertRem;
margin-bottom: 15rem / $pxConvertRem;
border: 1px solid #c9c9c9;
color: #676767;
font-size: 26rem / $pxConvertRem;
.tag {
position: absolute;
bottom: 0;
left: 0;
right: 0;
color: #fff;
text-align: center;
font-size: 12px;
&.chosed {
border-color: #000;
background: image-url('shopping-cart/black-right.png') no-repeat;
background-size: 30rem / $pxConvertRem;
background-position: bottom right;
&:before {
display: block;
line-height: 1;
@include transform(scale(0.833));
}
}
.goods {
margin-right: -20rem / $pxConvertRem;
.gift-tag {
height: 25rem / $pxConvertRem;
background: #a1ce4e;
.price-wrap {
position: static;
text-align: left;
&:before {
content: '赠品';
}
}
.price {
color: #444;
}
.advance-buy-tag {
height: 25rem / $pxConvertRem;
background: #eb76aa;
.count {
display: inline;
margin-left: 20rem / $pxConvertRem;
}
&:before {
content: '加价购';
}
}
.deps {
margin-left: 135rem / $pxConvertRem;
}
.name {
font-size: 28rem / $pxConvertRem;
max-width: 70%;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.name {
max-width: pxToRem(400px);
.row:nth-child(2) {
height: 45rem / $pxConvertRem;
line-height: 45rem / $pxConvertRem;
> span {
margin-right: 15rem / $pxConvertRem;
}
}
.color, .size {
color: #b6b6b6;
}
.price-wrap {
position: absolute;
top: 20rem / $pxConvertRem;
right: 30rem / $pxConvertRem;
text-align: right;
}
.price {
color: #e01;
}
.count {
display: block;
color: #999;
text-align: right;
line-height: 45rem / $pxConvertRem;
}
.appear-date {
color: #f00;
}
}
.sale-invoice {
margin-top: -20rem / $pxConvertRem;
font-size: 24rem / $pxConvertRem;
... ...
@import "header-download", "banner-top","banner-center","banner-bottom", "side-nav", "floor-header", "hot-brands", "fine-brands", "creative-life", "plus-star", "maybe-like",
"icons-enter","trendsetter-collocation",
"trend-topics","goods-category","hot-brands", "hot-category", "home-header", "thumb-row", "fresh-only";
"trend-topics","goods-category","hot-brands", "hot-category", "home-header", "thumb-row", "fresh-only", "coupon";
.mobile-container{
width: 100%;
... ...
... ... @@ -31,10 +31,10 @@
.index-logo {
float: left;
width: 216rem / $pxConvertRem;
width: 288rem / $pxConvertRem;
height: 96rem / $pxConvertRem;
background: image-url("yohologo.png") left center no-repeat;
background-size: 104px 25px;
background-size: 280rem / $pxConvertRem 60rem / $pxConvertRem;
opacity: 1;
transition: all 400ms;
... ...
... ... @@ -171,7 +171,16 @@
border: none;
-webkit-appearance: none;
}
p{
position: absolute;
top: 0;
right: pxToRem(40px);
width: pxToRem(360px);
height: pxToRem(88px);
color: #444;
padding: 0;
border: none;
}
.address {
height: pxToRem(88px) * 2;
}
... ...
... ... @@ -8,7 +8,7 @@
height: pxToRem(28px);
margin-left: pxToRem(50px);
background: image-url('product/service.png') no-repeat;
background-size: cover;
background-size: 100% auto;
}
.detail{
margin-bottom: 1px;
... ...