fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 7c22b5cfe194802f7386135241765dc352349a19 2 parents 0ee7f32a e3541ff9

merge product

Inline Side-by-side
Showing 11 changed files with 52 additions and 62 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 = {};
@@ -350,7 +350,7 @@ const _getSkuDataByProductBaseInfo = (data) => { @@ -350,7 +350,7 @@ const _getSkuDataByProductBaseInfo = (data) => {
350 goodsId: size.size_id, 350 goodsId: size.size_id,
351 notify: size.notify, 351 notify: size.notify,
352 soldOut: _.parseInt(size.storage_number) === 0, 352 soldOut: _.parseInt(size.storage_number) === 0,
353 - info: size.size_info 353 + info: _.get(size, 'size_info', '').replace(':', '/')
354 }); 354 });
355 355
356 // 单个sku商品的总数 356 // 单个sku商品的总数
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <span class="iconfont triangle">&#xe6c1;</span> 14 <span class="iconfont triangle">&#xe6c1;</span>
15 </div> 15 </div>
16 16
17 - <div class="after-service-content info-block bl"> 17 + <div class="after-service-content info-block">
18 <div class="block-title"> 18 <div class="block-title">
19 <span class="title-head"> 19 <span class="title-head">
20 <span class="title cur">退换货流程</span> 20 <span class="title cur">退换货流程</span>
@@ -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>
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="magnifier move-object hide"></div> 35 <div class="magnifier move-object hide"></div>
36 <div class="magnifier move-over"></div> 36 <div class="magnifier move-over"></div>
37 <div id="max" class="magnifier max hide"> 37 <div id="max" class="magnifier max hide">
38 - <img id='big' src="{{image img 1742 2323}}"> 38 + <img id='big' src="{{image img 750 1000}}">
39 </div> 39 </div>
40 </div> 40 </div>
41 41
@@ -48,14 +48,14 @@ @@ -48,14 +48,14 @@
48 {{# thumbs}} 48 {{# thumbs}}
49 <img class="thumb {{#if @first}}active{{/if}}" src="{{image img 75 100}}" 49 <img class="thumb {{#if @first}}active{{/if}}" src="{{image img 75 100}}"
50 data-shower="{{image shower 420 560}}" 50 data-shower="{{image shower 420 560}}"
51 - data-origin="{{image shower 1001 1333}}"> 51 + data-origin="{{image shower 750 1000}}">
52 {{/ thumbs}} 52 {{/ thumbs}}
53 {{^}} 53 {{^}}
54 {{# thumbs}} 54 {{# thumbs}}
55 <img class="thumb lazy" 55 <img class="thumb lazy"
56 data-original="{{image img 75 100}}" 56 data-original="{{image img 75 100}}"
57 data-shower="{{image shower 420 560}}" 57 data-shower="{{image shower 420 560}}"
58 - data-origin="{{image shower 1001 1333}}"> 58 + data-origin="{{image shower 750 1000}}">
59 {{/ thumbs}} 59 {{/ thumbs}}
60 {{/if}} 60 {{/if}}
61 </div> 61 </div>

8.8 KB | W: | H:

17.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.33 KB | W: | H:

2.02 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.6 KB | W: | H:

1.52 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -299,7 +299,7 @@ bindEvent.add(function() { @@ -299,7 +299,7 @@ bindEvent.add(function() {
299 } 299 }
300 300
301 // 查看细节图功能 301 // 查看细节图功能
302 - var moveWidth = 135, // eslint-disable-line 302 + var moveWidth = 314, // eslint-disable-line
303 magnifier = 560, 303 magnifier = 560,
304 w = 420, 304 w = 420,
305 h = 560, 305 h = 560,
@@ -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,32 +1032,28 @@ @@ -1032,32 +1032,28 @@
1032 } 1032 }
1033 1033
1034 .info-block { 1034 .info-block {
1035 - margin-top: 36px;  
1036 - margin-left: 150px;  
1037 - margin-right: 150px; 1035 + margin-top: 55px;
  1036 + margin-left: 175px;
  1037 + margin-right: 175px;
1038 color: #999; 1038 color: #999;
1039 border-top: 1px solid #e0e0e0; 1039 border-top: 1px solid #e0e0e0;
1040 font-size: 12px; 1040 font-size: 12px;
1041 1041
1042 - &.bl {  
1043 - margin-left: 80px;  
1044 - margin-right: 80px;  
1045 - }  
1046 -  
1047 &.head { 1042 &.head {
  1043 + margin-top: 35px;
1048 border-top: none !important; 1044 border-top: none !important;
1049 } 1045 }
1050 1046
1051 .basic { 1047 .basic {
1052 width: 100%; 1048 width: 100%;
1053 - margin: 0 auto; 1049 + margin: -10px auto 0;
1054 1050
1055 li { 1051 li {
1056 float: left; 1052 float: left;
1057 width: 25%; 1053 width: 25%;
1058 margin-top: 10px; 1054 margin-top: 10px;
1059 - margin-bottom: 10px;  
1060 font-size: 14px; 1055 font-size: 14px;
  1056 + line-height: 22px;
1061 1057
1062 color: #444; 1058 color: #444;
1063 1059
@@ -1080,7 +1076,7 @@ @@ -1080,7 +1076,7 @@
1080 .comfort { 1076 .comfort {
1081 width: 510px; 1077 width: 510px;
1082 border: 1px solid #e0e0e0; 1078 border: 1px solid #e0e0e0;
1083 - margin: 20px auto; 1079 + margin: 20px auto 0;
1084 padding-bottom: 10px; 1080 padding-bottom: 10px;
1085 padding-top: 10px; 1081 padding-top: 10px;
1086 color: #444; 1082 color: #444;
@@ -1170,15 +1166,16 @@ @@ -1170,15 +1166,16 @@
1170 1166
1171 .material-detail li { 1167 .material-detail li {
1172 position: relative; 1168 position: relative;
1173 - width: 860px;  
1174 - min-height: 40px;  
1175 - padding-bottom: 10px;  
1176 - margin: 0 auto 20px; 1169 + margin-bottom: 30px;
  1170 +
  1171 + &:last-child {
  1172 + margin-bottom: 0;
  1173 + }
1177 1174
1178 .img-wrap { 1175 .img-wrap {
1179 position: absolute; 1176 position: absolute;
1180 top: 50%; 1177 top: 50%;
1181 - margin-top: -30px; 1178 + margin-top: -20px;
1182 1179
1183 img { 1180 img {
1184 float: left; 1181 float: left;
@@ -1190,7 +1187,6 @@ @@ -1190,7 +1187,6 @@
1190 float: left; 1187 float: left;
1191 width: 120px; 1188 width: 120px;
1192 line-height: 20px; 1189 line-height: 20px;
1193 - border-right: 1px dotted #eaeceb;  
1194 color: #000; 1190 color: #000;
1195 text-align: center; 1191 text-align: center;
1196 font-size: 16px; 1192 font-size: 16px;
@@ -1200,7 +1196,7 @@ @@ -1200,7 +1196,7 @@
1200 .text { 1196 .text {
1201 float: left; 1197 float: left;
1202 width: 538px; 1198 width: 538px;
1203 - padding-left: 20px; 1199 + padding-left: 40px;
1204 margin-left: 240px; 1200 margin-left: 240px;
1205 line-height: 24px; 1201 line-height: 24px;
1206 font-size: 14px; 1202 font-size: 14px;
@@ -1308,7 +1304,7 @@ @@ -1308,7 +1304,7 @@
1308 font-size: 14px; 1304 font-size: 14px;
1309 line-height: 20px; 1305 line-height: 20px;
1310 text-align: center; 1306 text-align: center;
1311 - margin-top: 30px; 1307 + margin-top: 20px;
1312 margin-bottom: 30px; 1308 margin-bottom: 30px;
1313 } 1309 }
1314 1310
@@ -1463,10 +1459,10 @@ @@ -1463,10 +1459,10 @@
1463 .comment-star { 1459 .comment-star {
1464 position: relative; 1460 position: relative;
1465 display: inline-block; 1461 display: inline-block;
1466 - height: 16px;  
1467 - width: 75px; 1462 + height: 13px;
  1463 + width: 70px;
1468 cursor: pointer; 1464 cursor: pointer;
1469 - background: resolve("product/star.png") 0 -35px repeat-x; 1465 + background: resolve("product/star.png") 0 -29px repeat-x;
1470 vertical-align: top; 1466 vertical-align: top;
1471 1467
1472 .star-1, .star-2, .star-3, .star-4, .star-5 { 1468 .star-1, .star-2, .star-3, .star-4, .star-5 {
@@ -1474,24 +1470,24 @@ @@ -1474,24 +1470,24 @@
1474 left: 0; 1470 left: 0;
1475 top: 0; 1471 top: 0;
1476 display: inline-block; 1472 display: inline-block;
1477 - height: 16px;  
1478 - width: 15px; 1473 + height: 14px;
  1474 + width: 14px;
1479 1475
1480 &.active { 1476 &.active {
1481 background: resolve("product/star.png") repeat-x; 1477 background: resolve("product/star.png") repeat-x;
1482 } 1478 }
1483 } 1479 }
1484 .star-2 { 1480 .star-2 {
1485 - width: 30px; 1481 + width: 28px;
1486 } 1482 }
1487 .star-3 { 1483 .star-3 {
1488 - width: 45px; 1484 + width: 42px;
1489 } 1485 }
1490 .star-4 { 1486 .star-4 {
1491 - width: 60px; 1487 + width: 56px;
1492 } 1488 }
1493 .star-5 { 1489 .star-5 {
1494 - width: 75px; 1490 + width: 70px;
1495 } 1491 }
1496 1492
1497 &.editable > span { 1493 &.editable > span {
@@ -1509,12 +1505,8 @@ @@ -1509,12 +1505,8 @@
1509 1505
1510 } 1506 }
1511 1507
1512 - li:first-child {  
1513 - border-top: 0px;  
1514 - }  
1515 -  
1516 li { 1508 li {
1517 - border-top: 1px solid #eaeceb; 1509 + border-bottom: 1px solid #eaeceb;
1518 padding: 20px 0; 1510 padding: 20px 0;
1519 min-height: 150px; 1511 min-height: 150px;
1520 } 1512 }
@@ -1799,10 +1791,6 @@ @@ -1799,10 +1791,6 @@
1799 } 1791 }
1800 } 1792 }
1801 1793
1802 - .orange {  
1803 - color: #f9761a;  
1804 - }  
1805 -  
1806 h4 { 1794 h4 {
1807 font-weight: bold; 1795 font-weight: bold;
1808 font-size: 14px; 1796 font-size: 14px;
@@ -1816,9 +1804,8 @@ @@ -1816,9 +1804,8 @@
1816 } 1804 }
1817 1805
1818 .img-3 { 1806 .img-3 {
1819 - width: 982px;  
1820 - height: 330px;  
1821 - margin: 60px auto; 1807 + width: 801px;
  1808 + height: 339px;
1822 background: resolve("product/after-service.png"); 1809 background: resolve("product/after-service.png");
1823 } 1810 }
1824 1811
@@ -2308,7 +2295,7 @@ @@ -2308,7 +2295,7 @@
2308 .question { 2295 .question {
2309 display: inline-block; 2296 display: inline-block;
2310 float: left; 2297 float: left;
2311 - width: 80%; 2298 + width: 75%;
2312 } 2299 }
2313 2300
2314 .iconfont { 2301 .iconfont {
@@ -2384,7 +2371,7 @@ @@ -2384,7 +2371,7 @@
2384 2371
2385 .answer { 2372 .answer {
2386 display: inline-block; 2373 display: inline-block;
2387 - width: 810px; 2374 + width: 770px;
2388 float: left; 2375 float: left;
2389 margin-top: 0 !important; 2376 margin-top: 0 !important;
2390 } 2377 }
@@ -2428,7 +2415,6 @@ @@ -2428,7 +2415,6 @@
2428 } 2415 }
2429 2416
2430 #judge { 2417 #judge {
2431 - margin: 30px 150px 10px 150px;  
2432 2418
2433 .judge-content { 2419 .judge-content {
2434 background-color: #fff; 2420 background-color: #fff;
@@ -2459,7 +2445,7 @@ @@ -2459,7 +2445,7 @@
2459 2445
2460 .msg-pager { 2446 .msg-pager {
2461 text-align: center; 2447 text-align: center;
2462 - margin: 10px auto; 2448 + margin: 30px auto 0;
2463 2449
2464 } 2450 }
2465 } 2451 }
@@ -2581,9 +2567,9 @@ @@ -2581,9 +2567,9 @@
2581 /****放大镜****/ 2567 /****放大镜****/
2582 .magnifier { 2568 .magnifier {
2583 &.move-object { 2569 &.move-object {
2584 - height: 135px;  
2585 - width: 135px;  
2586 - background: resolve("product/move.png") no-repeat; 2570 + height: 314px;
  2571 + width: 314px;
  2572 + background: resolve("product/move.png");
2587 top: 0; 2573 top: 0;
2588 right: 0; 2574 right: 0;
2589 position: absolute; 2575 position: absolute;