fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit cc9f027ec829c0d91a61d498abc55d0e2a88767c 2 parents e5481d32 91b32fc5

Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

Inline Side-by-side
Showing 2 changed files with 38 additions and 11 deletions
... ... @@ -216,6 +216,7 @@
<script type="text/html" id="mini-cart-tpl">
\{{#carData}}
<div class="rich-cart">
<h3 class="rich-cart-title">最近加入的商品:</h3>
<div class="goods-list">
\{{# totalGoods}}
\{{#notzero buy_number}}
... ... @@ -270,6 +271,7 @@
</div>
<div class="go-full-cart">
<div>
<p>购物车里还有22件商品</p>
<a href="//www.yohobuy.com/shopping/cart">去购物车结算</a>
</div>
</div>
... ...
... ... @@ -516,15 +516,23 @@
background: #f8f8f8;
}
.rich-cart-title {
font-size: 16px;
color: #000;
line-height: 16px;
padding: 18px 26px;
border-bottom: 1px solid #dcdcdc;
}
.goods-list {
padding-top: 20px;
padding-top: 0;
margin-bottom: 15px;
max-height: 444px;
max-height: 368px;
overflow-x: hidden;
}
.goods-item {
padding: 0 0 18px 18px;
padding: 0 0 8px 26px;
> div {
font-size: 14px;
... ... @@ -537,16 +545,17 @@
}
.goods-img {
width: 60px;
width: 16px;
}
.goods-info {
width: 170px;
width: 160px;
color: #b0b0b0;
span {
display: inline-block;
width: 50px;
max-width: 50px;
margin-right: 14px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
... ... @@ -560,9 +569,10 @@
}
.title {
width: 170px;
width: 160px;
height: 14px;
font-size: 14px;
color: #444;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
... ... @@ -600,13 +610,28 @@
}
.go-full-cart {
padding: 0 18px;
padding: 0 25px;
> div {
height: 61px;
line-height: 61px;
height: 88px;
border-top: 1px solid #dcdcdc;
text-align: center;
text-align: left;
}
p {
font-size: 13px;
color: #444;
text-align: right;
padding-top: 14px;
padding-bottom: 8px;
}
a {
display: inline-block;
color: #fff;
background-color: #d0021b;
padding: 10px 11px;
border-radius: 0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
}
}
}
... ...