Showing
3 changed files
with
38 additions
and
31 deletions
| @@ -292,25 +292,6 @@ | @@ -292,25 +292,6 @@ | ||
| 292 | </div> | 292 | </div> |
| 293 | {{/stat}} | 293 | {{/stat}} |
| 294 | 294 | ||
| 295 | -<<<<<<< HEAD | ||
| 296 | - <div class="cart-del-goods"> | ||
| 297 | - <p class="cart-del-goods-title">已删除商品，您可以重新购买或移入收藏：</p> | ||
| 298 | - <ul> | ||
| 299 | - <li> | ||
| 300 | - <span class="good-name" style="width: 392px;"><a>TEEBACOO虎头字母短袖T恤</a></span> | ||
| 301 | - <span class="good-price" style="width: 148px;">¥760.00</span> | ||
| 302 | - <span class="good-num" style="width: 128px;">2</span> | ||
| 303 | - <span class="good-operate" style="width: 260px;"><a>重新购买</a><a>移入收藏</a></span> | ||
| 304 | - </li> | ||
| 305 | - <li> | ||
| 306 | - <span class="good-name" style="width: 392px;"><a>TEEBACOO虎头字母短袖T恤</a></span> | ||
| 307 | - <span class="good-price" style="width: 148px;">¥760.00</span> | ||
| 308 | - <span class="good-num" style="width: 128px;">2</span> | ||
| 309 | - <span class="good-operate" style="width: 260px;"><a>重新购买</a><a>移入收藏</a></span> | ||
| 310 | - </li> | ||
| 311 | - </ul> | ||
| 312 | - </div> | ||
| 313 | -======= | ||
| 314 | {{#if deleteShop}} | 295 | {{#if deleteShop}} |
| 315 | <div class="cart-del-goods"> | 296 | <div class="cart-del-goods"> |
| 316 | <p class="cart-del-goods-title">已删除商品，您可以重新购买或移入收藏：</p> | 297 | <p class="cart-del-goods-title">已删除商品，您可以重新购买或移入收藏：</p> |
| @@ -331,7 +312,6 @@ | @@ -331,7 +312,6 @@ | ||
| 331 | </ul> | 312 | </ul> |
| 332 | </div> | 313 | </div> |
| 333 | {{/if}} | 314 | {{/if}} |
| 334 | ->>>>>>> 88dbe2bef993419080ce441df806a520fe63cc67 | ||
| 335 | 315 | ||
| 336 | {{> cart-pre-sell-tpl }} | 316 | {{> cart-pre-sell-tpl }} |
| 337 | </div> | 317 | </div> |
| @@ -216,6 +216,7 @@ | @@ -216,6 +216,7 @@ | ||
| 216 | <script type="text/html" id="mini-cart-tpl"> | 216 | <script type="text/html" id="mini-cart-tpl"> |
| 217 | \{{#carData}} | 217 | \{{#carData}} |
| 218 | <div class="rich-cart"> | 218 | <div class="rich-cart"> |
| 219 | + <h3 class="rich-cart-title">最近加入的商品:</h3> | ||
| 219 | <div class="goods-list"> | 220 | <div class="goods-list"> |
| 220 | \{{# totalGoods}} | 221 | \{{# totalGoods}} |
| 221 | \{{#notzero buy_number}} | 222 | \{{#notzero buy_number}} |
| @@ -270,6 +271,7 @@ | @@ -270,6 +271,7 @@ | ||
| 270 | </div> | 271 | </div> |
| 271 | <div class="go-full-cart"> | 272 | <div class="go-full-cart"> |
| 272 | <div> | 273 | <div> |
| 274 | + <p>购物车里还有22件商品</p> | ||
| 273 | <a href="//www.yohobuy.com/shopping/cart">去购物车结算</a> | 275 | <a href="//www.yohobuy.com/shopping/cart">去购物车结算</a> |
| 274 | </div> | 276 | </div> |
| 275 | </div> | 277 | </div> |
| @@ -516,15 +516,23 @@ | @@ -516,15 +516,23 @@ | ||
| 516 | background: #f8f8f8; | 516 | background: #f8f8f8; |
| 517 | } | 517 | } |
| 518 | 518 | ||
| 519 | + .rich-cart-title { | ||
| 520 | + font-size: 16px; | ||
| 521 | + color: #000; | ||
| 522 | + line-height: 16px; | ||
| 523 | + padding: 18px 26px; | ||
| 524 | + border-bottom: 1px solid #dcdcdc; | ||
| 525 | + } | ||
| 526 | + | ||
| 519 | .goods-list { | 527 | .goods-list { |
| 520 | - padding-top: 20px; | 528 | + padding-top: 0; |
| 521 | margin-bottom: 15px; | 529 | margin-bottom: 15px; |
| 522 | - max-height: 444px; | 530 | + max-height: 368px; |
| 523 | overflow-x: hidden; | 531 | overflow-x: hidden; |
| 524 | } | 532 | } |
| 525 | 533 | ||
| 526 | .goods-item { | 534 | .goods-item { |
| 527 | - padding: 0 0 18px 18px; | 535 | + padding: 0 0 8px 26px; |
| 528 | 536 | ||
| 529 | > div { | 537 | > div { |
| 530 | font-size: 14px; | 538 | font-size: 14px; |
| @@ -537,16 +545,17 @@ | @@ -537,16 +545,17 @@ | ||
| 537 | } | 545 | } |
| 538 | 546 | ||
| 539 | .goods-img { | 547 | .goods-img { |
| 540 | - width: 60px; | 548 | + width: 16px; |
| 541 | } | 549 | } |
| 542 | 550 | ||
| 543 | .goods-info { | 551 | .goods-info { |
| 544 | - width: 170px; | 552 | + width: 160px; |
| 545 | color: #b0b0b0; | 553 | color: #b0b0b0; |
| 546 | 554 | ||
| 547 | span { | 555 | span { |
| 548 | display: inline-block; | 556 | display: inline-block; |
| 549 | - width: 50px; | 557 | + max-width: 50px; |
| 558 | + margin-right: 14px; | ||
| 550 | overflow: hidden; | 559 | overflow: hidden; |
| 551 | text-overflow: ellipsis; | 560 | text-overflow: ellipsis; |
| 552 | white-space: nowrap; | 561 | white-space: nowrap; |
| @@ -560,9 +569,10 @@ | @@ -560,9 +569,10 @@ | ||
| 560 | } | 569 | } |
| 561 | 570 | ||
| 562 | .title { | 571 | .title { |
| 563 | - width: 170px; | 572 | + width: 160px; |
| 564 | height: 14px; | 573 | height: 14px; |
| 565 | font-size: 14px; | 574 | font-size: 14px; |
| 575 | + color: #444; | ||
| 566 | text-overflow: ellipsis; | 576 | text-overflow: ellipsis; |
| 567 | white-space: nowrap; | 577 | white-space: nowrap; |
| 568 | overflow: hidden; | 578 | overflow: hidden; |
| @@ -600,13 +610,28 @@ | @@ -600,13 +610,28 @@ | ||
| 600 | } | 610 | } |
| 601 | 611 | ||
| 602 | .go-full-cart { | 612 | .go-full-cart { |
| 603 | - padding: 0 18px; | 613 | + padding: 0 25px; |
| 604 | 614 | ||
| 605 | > div { | 615 | > div { |
| 606 | - height: 61px; | ||
| 607 | - line-height: 61px; | 616 | + height: 88px; |
| 608 | border-top: 1px solid #dcdcdc; | 617 | border-top: 1px solid #dcdcdc; |
| 609 | - text-align: center; | 618 | + text-align: left; |
| 619 | + } | ||
| 620 | + p { | ||
| 621 | + font-size: 13px; | ||
| 622 | + color: #444; | ||
| 623 | + text-align: right; | ||
| 624 | + padding-top: 14px; | ||
| 625 | + padding-bottom: 8px; | ||
| 626 | + } | ||
| 627 | + a { | ||
| 628 | + display: inline-block; | ||
| 629 | + color: #fff; | ||
| 630 | + background-color: #d0021b; | ||
| 631 | + padding: 10px 11px; | ||
| 632 | + border-radius: 0; | ||
| 633 | + -webkit-border-radius: 0; | ||
| 634 | + -moz-border-radius: 0; | ||
| 610 | } | 635 | } |
| 611 | } | 636 | } |
| 612 | } | 637 | } |
-
Please register or login to post a comment