Authored by yyq

Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6

@@ -268,6 +268,8 @@ @@ -268,6 +268,8 @@
268 .sale-nav { 268 .sale-nav {
269 display: inline-block; 269 display: inline-block;
270 width: 100%; 270 width: 100%;
  271 + height: 40px;
  272 + background-color: #f5f5f5;
271 } 273 }
272 li { 274 li {
273 cursor: pointer; 275 cursor: pointer;
@@ -498,25 +500,16 @@ @@ -498,25 +500,16 @@
498 500
499 > .price { 501 > .price {
500 margin-top: 5px; 502 margin-top: 5px;
501 - text-align: left;  
502 - font-weight: bold;  
503 - }  
504 -  
505 - .vip-center {  
506 text-align: center; 503 text-align: center;
  504 + font-weight: bold;
507 } 505 }
508 506
509 .brand { 507 .brand {
510 display: none; 508 display: none;
511 } 509 }
512 510
513 - .sale-price {  
514 - margin-left: 30px;  
515 - }  
516 -  
517 .market-price { 511 .market-price {
518 text-decoration: line-through; 512 text-decoration: line-through;
519 - margin-left: 30px;  
520 color: #444; 513 color: #444;
521 font-weight: bold; 514 font-weight: bold;
522 } 515 }
@@ -524,37 +517,41 @@ @@ -524,37 +517,41 @@
524 .vip-span { 517 .vip-span {
525 background-repeat: no-repeat; 518 background-repeat: no-repeat;
526 background-size: 100% 100%; 519 background-size: 100% 100%;
527 - width: 20px;  
528 - height: 15px;  
529 - line-height: 15px; 520 + line-height: 20px;
530 color: #fff; 521 color: #fff;
531 font-style: italic; 522 font-style: italic;
532 margin-right: 5px; 523 margin-right: 5px;
533 margin-left: 10px; 524 margin-left: 10px;
  525 + margin-bottom: -3px;
534 padding-right: 5px; 526 padding-right: 5px;
535 padding-left: 5px; 527 padding-left: 5px;
536 - margin-left: 10px; 528 + display: inline-block;
537 } 529 }
538 530
539 .vip-tag { 531 .vip-tag {
540 background-image: resolve("sale/vip.png"); 532 background-image: resolve("sale/vip.png");
541 margin-left: 30px; 533 margin-left: 30px;
  534 + width: 20px;
  535 + height: 15px;
542 } 536 }
543 537
544 .vip-1 { 538 .vip-1 {
545 - background-image: resolve("product/silver-small.png");  
546 - float: left;  
547 - margin-top: -3px; 539 + background-image: resolve("product/silver.png");
  540 + margin-left: 30px;
  541 + width: 16px;
  542 + height: 16px;
548 } 543 }
549 .vip-2 { 544 .vip-2 {
550 - background-image: resolve("product/golden-small.png");  
551 - float: left;  
552 - margin-top: -3px; 545 + background-image: resolve("product/golden.png");
  546 + margin-left: 30px;
  547 + width: 16px;
  548 + height: 16px;
553 } 549 }
554 .vip-3 { 550 .vip-3 {
555 - background-image: resolve("product/platinum-small.png");  
556 - float: left;  
557 - margin-top: -3px; 551 + background-image: resolve("product/platinum.png");
  552 + margin-left: 30px;
  553 + width: 16px;
  554 + height: 16px;
558 } 555 }
559 } 556 }
560 } 557 }
@@ -622,17 +619,79 @@ @@ -622,17 +619,79 @@
622 619
623 .good-info { 620 .good-info {
624 .good-detail-text { 621 .good-detail-text {
  622 +
625 > .price { 623 > .price {
626 margin-top: 5px; 624 margin-top: 5px;
627 - text-align: center; 625 + text-align: left;
  626 + font-weight: bold;
  627 + }
  628 +
  629 + .brand {
  630 + display: none;
  631 + }
  632 +
  633 + .sale-price {
  634 + margin-left: 2px;
  635 + z-index: 1;
628 } 636 }
629 637
630 .market-price { 638 .market-price {
631 text-decoration: line-through; 639 text-decoration: line-through;
632 - margin-right: 15px; 640 + margin-left: 0;
  641 + margin-right: 65px;
  642 + float: right;
633 color: #444; 643 color: #444;
634 font-weight: bold; 644 font-weight: bold;
635 } 645 }
  646 +
  647 + .vip-center {
  648 + text-align: center;
  649 + .market-price {
  650 + margin-left: 0;
  651 + }
  652 + .sale-price {
  653 + margin-left: 0;
  654 + }
  655 + }
  656 +
  657 + .vip-span {
  658 + z-index: 100;
  659 + background-repeat: no-repeat;
  660 + background-size: 100% 100%;
  661 + width: 16px;
  662 + height: 16px;
  663 + line-height: 20px;
  664 + color: #fff;
  665 + font-style: italic;
  666 + margin-right: 5px;
  667 + padding-right: 5px;
  668 + padding-left: 5px;
  669 + margin-left: 10px;
  670 + }
  671 +
  672 + .vip-tag {
  673 + background-image: resolve("sale/vip.png");
  674 + margin-left: 30px;
  675 + }
  676 +
  677 + .vip-1 {
  678 + background-image: resolve("product/silver.png");
  679 + float: left;
  680 + margin-top: -3px;
  681 + margin-left: 0;
  682 + }
  683 + .vip-2 {
  684 + background-image: resolve("product/golden.png");
  685 + float: left;
  686 + margin-top: -3px;
  687 + margin-left: 0;
  688 + }
  689 + .vip-3 {
  690 + background-image: resolve("product/platinum.png");
  691 + float: left;
  692 + margin-top: -3px;
  693 + margin-left: 0;
  694 + }
636 } 695 }
637 } 696 }
638 } 697 }
@@ -189,26 +189,12 @@ @@ -189,26 +189,12 @@
189 .good-info { 189 .good-info {
190 .good-detail-text { 190 .good-detail-text {
191 191
192 - > a {  
193 - margin-top: 16px;  
194 - line-height: 1.5;  
195 - display: block;  
196 - text-align: center;  
197 - font-weight: 600;  
198 -  
199 - @mixin ellipsis;  
200 - }  
201 -  
202 > .price { 192 > .price {
203 margin-top: 5px; 193 margin-top: 5px;
204 text-align: left; 194 text-align: left;
205 font-weight: bold; 195 font-weight: bold;
206 } 196 }
207 197
208 - .vip-center {  
209 - text-align: center;  
210 - }  
211 -  
212 .brand { 198 .brand {
213 display: none; 199 display: none;
214 } 200 }
@@ -224,12 +210,22 @@ @@ -224,12 +210,22 @@
224 font-weight: bold; 210 font-weight: bold;
225 } 211 }
226 212
  213 + .vip-center {
  214 + text-align: center;
  215 + .market-price {
  216 + margin-left: 0;
  217 + }
  218 + .sale-price {
  219 + margin-left: 0;
  220 + }
  221 + }
  222 +
227 .vip-span { 223 .vip-span {
228 background-repeat: no-repeat; 224 background-repeat: no-repeat;
229 background-size: 100% 100%; 225 background-size: 100% 100%;
230 - width: 20px;  
231 - height: 15px;  
232 - line-height: 15px; 226 + width: 16px;
  227 + height: 16px;
  228 + line-height: 20px;
233 color: #fff; 229 color: #fff;
234 font-style: italic; 230 font-style: italic;
235 margin-right: 5px; 231 margin-right: 5px;
@@ -245,17 +241,17 @@ @@ -245,17 +241,17 @@
245 } 241 }
246 242
247 .vip-1 { 243 .vip-1 {
248 - background-image: resolve("product/silver-small.png"); 244 + background-image: resolve("product/silver.png");
249 float: left; 245 float: left;
250 margin-top: -3px; 246 margin-top: -3px;
251 } 247 }
252 .vip-2 { 248 .vip-2 {
253 - background-image: resolve("product/golden-small.png"); 249 + background-image: resolve("product/golden.png");
254 float: left; 250 float: left;
255 margin-top: -3px; 251 margin-top: -3px;
256 } 252 }
257 .vip-3 { 253 .vip-3 {
258 - background-image: resolve("product/platinum-small.png"); 254 + background-image: resolve("product/platinum.png");
259 float: left; 255 float: left;
260 margin-top: -3px; 256 margin-top: -3px;
261 } 257 }