Authored by htoooth

fix css

@@ -1196,11 +1196,6 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => { @@ -1196,11 +1196,6 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
1196 ); // 限购商品的状态 1196 ); // 限购商品的状态
1197 } 1197 }
1198 1198
1199 - if (propOrigin('brand_info', '')) {  
1200 - requestApi.brand =  
1201 - brandService.getBrandByDomainAsync(propOrigin('brand_info.brand_domain')); // 品牌信息  
1202 - }  
1203 -  
1204 if (propOrigin('bundle_type') === BUNDLE_PRODUCE) { 1199 if (propOrigin('bundle_type') === BUNDLE_PRODUCE) {
1205 requestApi.bundle = productAPI.getBundleAsync(result.skn); // 量贩 1200 requestApi.bundle = productAPI.getBundleAsync(result.skn); // 量贩
1206 } 1201 }
@@ -1212,7 +1207,6 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => { @@ -1212,7 +1207,6 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
1212 let promotionData = requestData.promotion; 1207 let promotionData = requestData.promotion;
1213 let coupon = requestData.coupon; 1208 let coupon = requestData.coupon;
1214 let limitedInfo = requestData.limited; 1209 let limitedInfo = requestData.limited;
1215 - let domainBrand = requestData.brand;  
1216 let bundle = requestData.bundle; 1210 let bundle = requestData.bundle;
1217 1211
1218 // 商品标签 1212 // 商品标签
@@ -1224,12 +1218,13 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => { @@ -1224,12 +1218,13 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
1224 // 是否收藏 1218 // 是否收藏
1225 result.isCollect = favoriteData.product; 1219 result.isCollect = favoriteData.product;
1226 1220
1227 - // 商品价格 1221 + // 带人民币符号的商品价格
1228 result.marketPrice = propOrigin('format_market_price'); 1222 result.marketPrice = propOrigin('format_market_price');
1229 result.salePrice = propOrigin('format_sales_price'); 1223 result.salePrice = propOrigin('format_sales_price');
1230 result.hasOtherPrice = true; 1224 result.hasOtherPrice = true;
1231 1225
1232 - if (result.salePrice === '0') { 1226 + //
  1227 + if (result.salePrice === '0' || result.marketPrice === result.salePrice) {
1233 delete result.salePrice; 1228 delete result.salePrice;
1234 result.hasOtherPrice = false; 1229 result.hasOtherPrice = false;
1235 } 1230 }
@@ -1437,18 +1432,6 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => { @@ -1437,18 +1432,6 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
1437 }; 1432 };
1438 } 1433 }
1439 1434
1440 -  
1441 - // 非普通商品导航条移除加入购物车按钮  
1442 - const hasNavCart = (pro) => {  
1443 - return !(pro.limitedsale === 'Y' ||  
1444 - pro.secKill === 'Y' ||  
1445 - pro.deposit === 'Y' ||  
1446 - pro.presale === 'Y' ||  
1447 - pro.bundle.type !== 0);  
1448 - };  
1449 -  
1450 - result.hasNavCart = hasNavCart(result);  
1451 -  
1452 // 电子票 1435 // 电子票
1453 result.isTicket = propOrigin('product_skn') === YOHOOD_TICKET; 1436 result.isTicket = propOrigin('product_skn') === YOHOOD_TICKET;
1454 if (virtualGoods && result.isTicket) { 1437 if (virtualGoods && result.isTicket) {
@@ -504,7 +504,7 @@ @@ -504,7 +504,7 @@
504 font-size: 12px; 504 font-size: 12px;
505 505
506 .title { 506 .title {
507 - margin-top: 10px; 507 + margin-top: 8px;
508 } 508 }
509 509
510 img { 510 img {
@@ -517,6 +517,7 @@ @@ -517,6 +517,7 @@
517 ul { 517 ul {
518 list-style: none; 518 list-style: none;
519 width: 510px; 519 width: 510px;
  520 + margin-top: -8px;
520 } 521 }
521 522
522 li { 523 li {
@@ -524,6 +525,8 @@ @@ -524,6 +525,8 @@
524 cursor: pointer; 525 cursor: pointer;
525 border: 1px solid #999999; 526 border: 1px solid #999999;
526 height: 34px; 527 height: 34px;
  528 + margin-top: 8px;
  529 + margin-bottom: 0;
527 530
528 &.focus { 531 &.focus {
529 border-color: black; 532 border-color: black;
@@ -558,7 +561,7 @@ @@ -558,7 +561,7 @@
558 height: 24px; 561 height: 24px;
559 line-height: 24px; 562 line-height: 24px;
560 margin-right: 8px; 563 margin-right: 8px;
561 - margin-bottom: 8px; 564 + margin-top: 8px;
562 padding: 0 10px; 565 padding: 0 10px;
563 border: 1px solid #999999; 566 border: 1px solid #999999;
564 text-align: center; 567 text-align: center;
@@ -585,6 +588,7 @@ @@ -585,6 +588,7 @@
585 .size { 588 .size {
586 float: left; 589 float: left;
587 color: black; 590 color: black;
  591 + margin-top: -8px;
588 } 592 }
589 593
590 .size-ruler { 594 .size-ruler {
@@ -607,7 +611,7 @@ @@ -607,7 +611,7 @@
607 font-size: 13px; 611 font-size: 13px;
608 color: #999; 612 color: #999;
609 clear: both; 613 clear: both;
610 - margin-top: -5px; 614 + line-height: 25px;
611 } 615 }
612 616
613 .line { 617 .line {
@@ -1152,7 +1156,7 @@ @@ -1152,7 +1156,7 @@
1152 1156
1153 .material-content { 1157 .material-content {
1154 /*display: none;*/ 1158 /*display: none;*/
1155 - overflow: hidden; 1159 + overflow: visible;
1156 } 1160 }
1157 1161
1158 .description-material-tab { 1162 .description-material-tab {
@@ -1892,6 +1896,7 @@ @@ -1892,6 +1896,7 @@
1892 font-size: 13px; 1896 font-size: 13px;
1893 color: #d0021b; 1897 color: #d0021b;
1894 clear: both; 1898 clear: both;
  1899 + line-height: 25px;
1895 1900
1896 .iconfont { 1901 .iconfont {
1897 font-size: 10px !important; 1902 font-size: 10px !important;
@@ -2099,6 +2104,9 @@ @@ -2099,6 +2104,9 @@
2099 2104
2100 .close { 2105 .close {
2101 .iconfont { 2106 .iconfont {
  2107 + position: absolute;
  2108 + top: 10px;
  2109 + right: 10px;
2102 font-size: 30px !important; 2110 font-size: 30px !important;
2103 } 2111 }
2104 } 2112 }