|
@@ -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) {
|