Authored by 王水玲

Merge branch 'feature/goodsDetail' into feature/removCamel

... ... @@ -361,7 +361,7 @@ const setProductData = base => {
// 有颜色图片时显示颜色图片,无颜色图片时显示rgb值
// 都没有则显示商品图
if (value.colorValue) {
group.bgImg = value.colorValue;
group.bgImg = helpers.image(value.colorValue, 30, 30);
} else if (value.colorCode) {
group.rgb = `#${value.colorCode}`;
} else {
... ... @@ -439,7 +439,7 @@ const setProductData = base => {
}
// 限购商品
if (base.isLimitBuy === 'Y') {
if (base.isLimitBuy === true) {
let isBeginSale = (base.saleStatus && +base.saleStatus) === 1; // 是否开售
let showStatus = 1; // 限购商品有关的展示状态
... ...