fe / yohobuy-node · Commits

Go to a project

Authored by OF1706
Commit d2fca63713aa6e65a1cc991275b0825af12dc0af 1 parent f43b77e3

样式

Inline Side-by-side
Showing 3 changed files with 56 additions and 34 deletions
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <div class="pay-wapper"> 56 <div class="pay-wapper">
57 <div class="cart-title"> 57 <div class="cart-title">
58 <p class="left" style="width:6%;"> 58 <p class="left" style="width:6%;">
59 - <i class="cart-item-check iconfont cart-item-checked"></i> 全选 59 + <i class="cart-item-check iconfont cart-item-checked"></i>&nbsp;&nbsp;全选
60 </p> 60 </p>
61 <p style="width:40%">商品信息</p> 61 <p style="width:40%">商品信息</p>
62 <p style="width:14%">单价</p> 62 <p style="width:14%">单价</p>
@@ -27,11 +27,10 @@ @@ -27,11 +27,10 @@
27 {{/unless}} 27 {{/unless}}
28 <a class="pay-pro-icon" href="{{link}}" target="_blank"> 28 <a class="pay-pro-icon" href="{{link}}" target="_blank">
29 <img src="{{imgCover}}"> 29 <img src="{{imgCover}}">
30 - {{#if isAdvance}}<span class="incentive red">预售</span>{{/if}} 30 + {{#if isAdvance}}<span class="incentive">预售</span>{{/if}}
31 </a> 31 </a>
32 <p class="pay-pro-info"> 32 <p class="pay-pro-info">
33 - {{#if tag}}<code class="order-pay-mark">{{tag}}</code>{{/if}}  
34 - <a href="{{link}}" target="_blank">{{productTitle}}</a> 33 + <a href="{{link}}" target="_blank"><code class="good-mark">7777{{tag}}</code>{{productTitle}}</a>
35 <em class="pay-pro-detail"><span><b title="{{productColor}}">颜色：{{productColor}}</b> 尺码：{{productSize}}<i class="iconfont">&#xe6c7;</i></span></em> 34 <em class="pay-pro-detail"><span><b title="{{productColor}}">颜色：{{productColor}}</b> 尺码：{{productSize}}<i class="iconfont">&#xe6c7;</i></span></em>
36 </p> 35 </p>
37 </div> 36 </div>
@@ -469,6 +469,9 @@ @@ -469,6 +469,9 @@
469 &:not(last-child){ 469 &:not(last-child){
470 margin-top:-1px; 470 margin-top:-1px;
471 } 471 }
  472 + &+.gift-sell {
  473 + margin-top: -1px;
  474 + }
472 } 475 }
473 476
474 .pre-sell { 477 .pre-sell {
@@ -490,11 +493,11 @@ @@ -490,11 +493,11 @@
490 493
491 .gift-sell { 494 .gift-sell {
492 border: 1px solid #e0e0e0; 495 border: 1px solid #e0e0e0;
493 - padding:20px 30px 20px 55px; 496 + padding: 18px 30px 19px 55px;
494 .order-pay-mark{ 497 .order-pay-mark{
495 - width: 70px;  
496 - height: 20px;  
497 - line-height: 20px; 498 + width: 66px;
  499 + height: 18px;
  500 + line-height: 18px;
498 display: inline-block; 501 display: inline-block;
499 margin-right: 20px; 502 margin-right: 20px;
500 background-color: #ff575c; 503 background-color: #ff575c;
@@ -513,6 +516,9 @@ @@ -513,6 +516,9 @@
513 color: #444; 516 color: #444;
514 line-height: 1; 517 line-height: 1;
515 margin-bottom: 8px; 518 margin-bottom: 8px;
  519 + &:last-child {
  520 + margin-bottom: 0;
  521 + }
516 } 522 }
517 .order-pay-link{ 523 .order-pay-link{
518 display: inline-block; 524 display: inline-block;
@@ -539,7 +545,7 @@ @@ -539,7 +545,7 @@
539 height: auto; 545 height: auto;
540 overflow: hidden; 546 overflow: hidden;
541 font-size: 12px; 547 font-size: 12px;
542 - margin-bottom: 5px; 548 + margin-bottom: 10px;
543 .tipsbox { 549 .tipsbox {
544 position: relative; 550 position: relative;
545 float: left; 551 float: left;
@@ -570,6 +576,19 @@ @@ -570,6 +576,19 @@
570 } 576 }
571 } 577 }
572 578
  579 + .good-mark {
  580 + min-width: 48px;
  581 + height: 16px;
  582 + line-height: 16px;
  583 + display: inline-block;
  584 + margin-right: 5px;
  585 + background-color: #ff575c;
  586 + color: #fff;
  587 + font-size: 12px;
  588 + text-align: center;
  589 + vertical-align: top;
  590 + }
  591 +
573 .order-pay { 592 .order-pay {
574 width: 100%; 593 width: 100%;
575 line-height: 150%; 594 line-height: 150%;
@@ -665,22 +684,22 @@ @@ -665,22 +684,22 @@
665 cursor: pointer; 684 cursor: pointer;
666 } 685 }
667 } 686 }
668 - .cart-btn-pre{ 687 + .cart-btn-pre {
669 background: url(/cart/pc_pre.png); 688 background: url(/cart/pc_pre.png);
670 } 689 }
671 - .cart-btn-next{ 690 + .cart-btn-next {
672 background: url(/cart/pc_next.png); 691 background: url(/cart/pc_next.png);
673 } 692 }
674 - .unfold-color{ 693 + .unfold-color {
675 color: #666; 694 color: #666;
676 cursor: pointer; 695 cursor: pointer;
677 } 696 }
678 - .cart-page{  
679 - p{ 697 + .cart-page {
  698 + p {
680 float: left; 699 float: left;
681 padding-right: 5px; 700 padding-right: 5px;
682 } 701 }
683 - .f-red{ 702 + .f-red {
684 color: #f00; 703 color: #f00;
685 } 704 }
686 } 705 }
@@ -704,7 +723,7 @@ @@ -704,7 +723,7 @@
704 } 723 }
705 li { 724 li {
706 position: relative; 725 position: relative;
707 - padding: 0 30px 0 60px; 726 + padding: 0 30px 0 54px;
708 &:hover { 727 &:hover {
709 .pay-pro-detail { 728 .pay-pro-detail {
710 border-color: #e0e0e0; 729 border-color: #e0e0e0;
@@ -714,6 +733,9 @@ @@ -714,6 +733,9 @@
714 } 733 }
715 734
716 } 735 }
  736 + .cart-item-check {
  737 + top: 63px;
  738 + }
717 } 739 }
718 .tr{ 740 .tr{
719 border-bottom: 1px solid #e0e0e0; 741 border-bottom: 1px solid #e0e0e0;
@@ -760,26 +782,27 @@ @@ -760,26 +782,27 @@
760 } 782 }
761 783
762 .out-of-stock { 784 .out-of-stock {
763 - position:absolute;  
764 - top:20px;  
765 - left:0; 785 + position: absolute;
  786 + top: 30px;
  787 + left: -35px;
766 display: inline-block; 788 display: inline-block;
767 font-size: 12px; 789 font-size: 12px;
768 color: #000; 790 color: #000;
769 background-color: #f0f0f0; 791 background-color: #f0f0f0;
770 padding: 8px 10px; 792 padding: 8px 10px;
771 line-height: 12px; 793 line-height: 12px;
  794 + z-index: 30;
772 &:after { 795 &:after {
773 position: absolute; 796 position: absolute;
774 - top: 52px;  
775 - left: 5px; 797 + top: 28px;
  798 + left: 8px;
776 content: ''; 799 content: '';
777 display: inline-block; 800 display: inline-block;
778 width: 0; 801 width: 0;
779 height: 0; 802 height: 0;
780 - border-top: 14px solid #f0f0f0;  
781 - border-left: 5px solid transparent;  
782 - border-right: 5px solid transparent; 803 + border-top: 5px solid #f0f0f0;
  804 + border-left: 8px solid transparent;
  805 + border-right: 8px solid transparent;
783 } 806 }
784 } 807 }
785 808
@@ -787,7 +810,7 @@ @@ -787,7 +810,7 @@
787 float: left; 810 float: left;
788 text-align: left; 811 text-align: left;
789 padding-left: 15px; 812 padding-left: 15px;
790 - padding-top: 10px; 813 + padding-top: 5px;
791 margin-left: 0; 814 margin-left: 0;
792 a { 815 a {
793 display:block; 816 display:block;
@@ -1045,7 +1068,6 @@ @@ -1045,7 +1068,6 @@
1045 width: 38px; 1068 width: 38px;
1046 text-align: center; 1069 text-align: center;
1047 height: 30px; 1070 height: 30px;
1048 - font-family: verdana;  
1049 color: #444; 1071 color: #444;
1050 font-size: 15px; 1072 font-size: 15px;
1051 border: 1px solid #e0e0e0; 1073 border: 1px solid #e0e0e0;
@@ -1165,22 +1187,23 @@ @@ -1165,22 +1187,23 @@
1165 1187
1166 .pay-pro-icon { 1188 .pay-pro-icon {
1167 float: left; 1189 float: left;
1168 - width: 70px; 1190 + width: 66px;
1169 height: 90px; 1191 height: 90px;
1170 - overflow: hidden; 1192 + border: 1px solid #e9e9e9;
  1193 + box-sizing: border-box;
1171 display: block; 1194 display: block;
1172 position: relative; 1195 position: relative;
1173 img { 1196 img {
1174 - max-width: 70px; 1197 + max-width: 66px;
1175 } 1198 }
1176 .incentive { 1199 .incentive {
1177 position: absolute; 1200 position: absolute;
1178 - left: 0px; 1201 + left: -1px;
1179 bottom: 0px; 1202 bottom: 0px;
1180 - width: 100%; 1203 + width: 66px;
1181 display: block; 1204 display: block;
1182 - height: 16px;  
1183 - line-height: 16px; 1205 + height: 18px;
  1206 + line-height: 18px;
1184 font-size:12px; 1207 font-size:12px;
1185 text-align: center; 1208 text-align: center;
1186 color: #fff; 1209 color: #fff;
@@ -1285,7 +1308,7 @@ @@ -1285,7 +1308,7 @@
1285 height: 15px; 1308 height: 15px;
1286 color:#e9e9e9; 1309 color:#e9e9e9;
1287 float: left; 1310 float: left;
1288 - margin-top: 25px; 1311 + margin-top: 0;
1289 margin-left: 15px; 1312 margin-left: 15px;
1290 display: inline-block; 1313 display: inline-block;
1291 cursor: pointer; 1314 cursor: pointer;