fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 36c9f2f34d0716568abd1dfa739c025bc13ef030 1 parent 2a742685

'fix_star'

Inline Side-by-side
Showing 5 changed files with 37 additions and 42 deletions
@@ -289,7 +289,7 @@ const _getSkuDataByProductBaseInfo = (data) => { @@ -289,7 +289,7 @@ const _getSkuDataByProductBaseInfo = (data) => {
289 }; 289 };
290 } 290 }
291 291
292 - skuGoods = _.get(data, 'goods_list', []).reduce((acc, cur, pos)=> { 292 + skuGoods = _.get(data, 'goods_list', []).reduce((acc, cur)=> {
293 293
294 // 如果status为0，即skc下架时就跳过该商品$value['status'] === 0 294 // 如果status为0，即skc下架时就跳过该商品$value['status'] === 0
295 let goodsGroup = {}; 295 let goodsGroup = {};
@@ -23,14 +23,17 @@ @@ -23,14 +23,17 @@
23 23
24 <div class="img-3"></div> 24 <div class="img-3"></div>
25 25
26 - <div class="info-block">  
27 - <div class="block-title">  
28 - <span class="title-head">  
29 - <span class="title cur">有货承诺</span>  
30 - </span>  
31 - </div> 26 +
  27 + </div>
  28 +
  29 +
  30 + <div class="info-block">
  31 + <div class="block-title">
  32 + <span class="title-head">
  33 + <span class="title cur">有货承诺</span>
  34 + </span>
  35 + <div id="saleReturn" class="support-saleReturned-service"></div>
32 </div> 36 </div>
33 </div> 37 </div>
34 38
35 - <div id="saleReturn" class="support-saleReturned-service"></div>  
36 </div> 39 </div>
@@ -93,6 +93,7 @@ @@ -93,6 +93,7 @@
93 93
94 签收商品未经穿着不影响二次销售的情况下，7日内退货，15日内换货； 94 签收商品未经穿着不影响二次销售的情况下，7日内退货，15日内换货；
95 退回商品保证吊牌、标签、包装完整，详情点击 95 退回商品保证吊牌、标签、包装完整，详情点击
  96 + <br />
96 <a href="http://www.yohobuy.com/help/?category_id=69" 97 <a href="http://www.yohobuy.com/help/?category_id=69"
97 target="_blank">&gt;&gt;退换货政策</a> 98 target="_blank">&gt;&gt;退换货政策</a>
98 </span> 99 </span>

1.6 KB | W: | H:

1.52 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -558,7 +558,7 @@ @@ -558,7 +558,7 @@
558 height: 24px; 558 height: 24px;
559 line-height: 24px; 559 line-height: 24px;
560 margin-right: 8px; 560 margin-right: 8px;
561 - margin-bottom: 5px; 561 + margin-bottom: 8px;
562 padding: 0 10px; 562 padding: 0 10px;
563 border: 1px solid #999999; 563 border: 1px solid #999999;
564 text-align: center; 564 text-align: center;
@@ -1032,7 +1032,7 @@ @@ -1032,7 +1032,7 @@
1032 } 1032 }
1033 1033
1034 .info-block { 1034 .info-block {
1035 - margin-top: 36px; 1035 + margin-top: 55px;
1036 margin-left: 175px; 1036 margin-left: 175px;
1037 margin-right: 175px; 1037 margin-right: 175px;
1038 color: #999; 1038 color: #999;
@@ -1040,19 +1040,20 @@ @@ -1040,19 +1040,20 @@
1040 font-size: 12px; 1040 font-size: 12px;
1041 1041
1042 &.head { 1042 &.head {
  1043 + margin-top: 35px;
1043 border-top: none !important; 1044 border-top: none !important;
1044 } 1045 }
1045 1046
1046 .basic { 1047 .basic {
1047 width: 100%; 1048 width: 100%;
1048 - margin: 0 auto; 1049 + margin: -10px auto 0;
1049 1050
1050 li { 1051 li {
1051 float: left; 1052 float: left;
1052 width: 25%; 1053 width: 25%;
1053 margin-top: 10px; 1054 margin-top: 10px;
1054 - margin-bottom: 10px;  
1055 font-size: 14px; 1055 font-size: 14px;
  1056 + line-height: 22px;
1056 1057
1057 color: #444; 1058 color: #444;
1058 1059
@@ -1075,7 +1076,7 @@ @@ -1075,7 +1076,7 @@
1075 .comfort { 1076 .comfort {
1076 width: 510px; 1077 width: 510px;
1077 border: 1px solid #e0e0e0; 1078 border: 1px solid #e0e0e0;
1078 - margin: 20px auto; 1079 + margin: 20px auto 0;
1079 padding-bottom: 10px; 1080 padding-bottom: 10px;
1080 padding-top: 10px; 1081 padding-top: 10px;
1081 color: #444; 1082 color: #444;
@@ -1165,15 +1166,16 @@ @@ -1165,15 +1166,16 @@
1165 1166
1166 .material-detail li { 1167 .material-detail li {
1167 position: relative; 1168 position: relative;
1168 - width: 860px;  
1169 - min-height: 40px;  
1170 - padding-bottom: 10px;  
1171 - margin: 0 auto 20px; 1169 + margin-bottom: 30px;
  1170 +
  1171 + &:last-child {
  1172 + margin-bottom: 0;
  1173 + }
1172 1174
1173 .img-wrap { 1175 .img-wrap {
1174 position: absolute; 1176 position: absolute;
1175 top: 50%; 1177 top: 50%;
1176 - margin-top: -30px; 1178 + margin-top: -20px;
1177 1179
1178 img { 1180 img {
1179 float: left; 1181 float: left;
@@ -1185,7 +1187,6 @@ @@ -1185,7 +1187,6 @@
1185 float: left; 1187 float: left;
1186 width: 120px; 1188 width: 120px;
1187 line-height: 20px; 1189 line-height: 20px;
1188 - border-right: 1px dotted #eaeceb;  
1189 color: #000; 1190 color: #000;
1190 text-align: center; 1191 text-align: center;
1191 font-size: 16px; 1192 font-size: 16px;
@@ -1195,7 +1196,7 @@ @@ -1195,7 +1196,7 @@
1195 .text { 1196 .text {
1196 float: left; 1197 float: left;
1197 width: 538px; 1198 width: 538px;
1198 - padding-left: 20px; 1199 + padding-left: 40px;
1199 margin-left: 240px; 1200 margin-left: 240px;
1200 line-height: 24px; 1201 line-height: 24px;
1201 font-size: 14px; 1202 font-size: 14px;
@@ -1303,7 +1304,7 @@ @@ -1303,7 +1304,7 @@
1303 font-size: 14px; 1304 font-size: 14px;
1304 line-height: 20px; 1305 line-height: 20px;
1305 text-align: center; 1306 text-align: center;
1306 - margin-top: 30px; 1307 + margin-top: 20px;
1307 margin-bottom: 30px; 1308 margin-bottom: 30px;
1308 } 1309 }
1309 1310
@@ -1458,10 +1459,10 @@ @@ -1458,10 +1459,10 @@
1458 .comment-star { 1459 .comment-star {
1459 position: relative; 1460 position: relative;
1460 display: inline-block; 1461 display: inline-block;
1461 - height: 16px;  
1462 - width: 75px; 1462 + height: 13px;
  1463 + width: 70px;
1463 cursor: pointer; 1464 cursor: pointer;
1464 - background: resolve("product/star.png") 0 -35px repeat-x; 1465 + background: resolve("product/star.png") 0 -29px repeat-x;
1465 vertical-align: top; 1466 vertical-align: top;
1466 1467
1467 .star-1, .star-2, .star-3, .star-4, .star-5 { 1468 .star-1, .star-2, .star-3, .star-4, .star-5 {
@@ -1469,24 +1470,24 @@ @@ -1469,24 +1470,24 @@
1469 left: 0; 1470 left: 0;
1470 top: 0; 1471 top: 0;
1471 display: inline-block; 1472 display: inline-block;
1472 - height: 16px;  
1473 - width: 15px; 1473 + height: 14px;
  1474 + width: 14px;
1474 1475
1475 &.active { 1476 &.active {
1476 background: resolve("product/star.png") repeat-x; 1477 background: resolve("product/star.png") repeat-x;
1477 } 1478 }
1478 } 1479 }
1479 .star-2 { 1480 .star-2 {
1480 - width: 30px; 1481 + width: 28px;
1481 } 1482 }
1482 .star-3 { 1483 .star-3 {
1483 - width: 45px; 1484 + width: 42px;
1484 } 1485 }
1485 .star-4 { 1486 .star-4 {
1486 - width: 60px; 1487 + width: 56px;
1487 } 1488 }
1488 .star-5 { 1489 .star-5 {
1489 - width: 75px; 1490 + width: 70px;
1490 } 1491 }
1491 1492
1492 &.editable > span { 1493 &.editable > span {
@@ -1504,12 +1505,8 @@ @@ -1504,12 +1505,8 @@
1504 1505
1505 } 1506 }
1506 1507
1507 - li:first-child {  
1508 - border-top: 0px;  
1509 - }  
1510 -  
1511 li { 1508 li {
1512 - border-top: 1px solid #eaeceb; 1509 + border-bottom: 1px solid #eaeceb;
1513 padding: 20px 0; 1510 padding: 20px 0;
1514 min-height: 150px; 1511 min-height: 150px;
1515 } 1512 }
@@ -1794,10 +1791,6 @@ @@ -1794,10 +1791,6 @@
1794 } 1791 }
1795 } 1792 }
1796 1793
1797 - .orange {  
1798 - color: #f9761a;  
1799 - }  
1800 -  
1801 h4 { 1794 h4 {
1802 font-weight: bold; 1795 font-weight: bold;
1803 font-size: 14px; 1796 font-size: 14px;
@@ -1813,7 +1806,6 @@ @@ -1813,7 +1806,6 @@
1813 .img-3 { 1806 .img-3 {
1814 width: 801px; 1807 width: 801px;
1815 height: 339px; 1808 height: 339px;
1816 - margin: 60px auto;  
1817 background: resolve("product/after-service.png"); 1809 background: resolve("product/after-service.png");
1818 } 1810 }
1819 1811
@@ -2423,7 +2415,6 @@ @@ -2423,7 +2415,6 @@
2423 } 2415 }
2424 2416
2425 #judge { 2417 #judge {
2426 - margin: 30px 175px 10px 175px;  
2427 2418
2428 .judge-content { 2419 .judge-content {
2429 background-color: #fff; 2420 background-color: #fff;
@@ -2454,7 +2445,7 @@ @@ -2454,7 +2445,7 @@
2454 2445
2455 .msg-pager { 2446 .msg-pager {
2456 text-align: center; 2447 text-align: center;
2457 - margin: 10px auto; 2448 + margin: 30px auto 0;
2458 2449
2459 } 2450 }
2460 } 2451 }