Authored by htoooth

fix

... ... @@ -37,29 +37,14 @@ const BUNDLE_PACKAGE = 1; // 套餐
const tdk = require('../../../utils/getTDK');
const productProcess = require('../../../utils/product-process');
function _getProductAdditionInfoAsync(data) {
return co(function* () {
let productId = _.get(data, 'product_id', 0);
let brandId = _.get(data, 'brand_info.brand_id', 0);
// 获取相关数据
let promiseData = {
productBanner: this.productAPI.getProductBannerAsync(productId),
bannerInfo: this.brandService.getBannerInfoAsync(brandId)
};
let result = yield Promise.props(promiseData);
return result;
}).bind(this)();
}
function _getProductIntroAsync(productId, productSkn) {
return co(function* () {
let result = yield Promise.props({
sizeInfo: this.productAPI.sizeInfoAsync(productSkn),
productComfort: this.productAPI.getProductComfortAsync(productId),
productModelTry: this.productAPI.getProductModelTryAsync(productSkn)
productModelTry: this.productAPI.getProductModelTryAsync(productSkn),
banner: this.productAPI.getProductBannerAsync(productId)
});
return result;
... ... @@ -186,9 +171,7 @@ function _getVipDataByProductBaseInfo(data, vipLevel, uid) {
}
// 活动
function _getProductActivityBanner(additionalData) {
let data = additionalData.productBanner;
function _getProductActivityBanner(data) {
if (_.isEmpty(data) ||
_.get(data, 'code', 400) !== 200 ||
!_.get(data, 'data.bannerImg')) {
... ... @@ -1058,7 +1041,6 @@ function _detailDataPkg(origin, uid, vipLevel, cookies) {
result.bundleType = propOrigin('bundle_type', 0);
let requestApi = {
addition: _getProductAdditionInfoAsync.call(this, origin), // 预处理所有的数据
fav: _getProductFavoriteDataAsync.call(this, uid, result.productId), // 处理收藏喜欢数据
promotion: this.productAPI.getPromotionAsync(result.skn), // 打折信息
coupon: this.couponService.listAsync(propOrigin('brand_info.brand_id'), result.skn, uid) // 优惠券
... ... @@ -1097,7 +1079,6 @@ function _detailDataPkg(origin, uid, vipLevel, cookies) {
let requestData = yield Promise.props(requestApi);
let additionalData = requestData.addition;
let favoriteData = requestData.fav;
let promotionData = requestData.promotion;
let coupon = requestData.coupon;
... ... @@ -1171,9 +1152,6 @@ function _detailDataPkg(origin, uid, vipLevel, cookies) {
}
}
// 促销活动图片
result.imageBanner = _getProductActivityBanner(additionalData);
// 促销活动,虚拟商品无促销
if (propOrigin('attribute') !== 3) {
result.activity = _getActivityDataByProductBaseInfo(promotionData);
... ... @@ -1552,6 +1530,9 @@ function showMainAsync(req, data) {
result.deatil = Object.assign(result.detail, intro);
// 促销活动图片, 在页面最底部
result.detail.goodsInfo.imageBanner = _getProductActivityBanner(productDescription.banner);
// seo
result.seo = _getSeoByGoodsInfo(productInfo.goodsInfo, sortNavigator);
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.