diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue index 52fdd0838..89839256d 100644 --- a/packages/sku/Sku.vue +++ b/packages/sku/Sku.vue @@ -53,7 +53,7 @@ >
({}) }, + showSoldoutSku: { + type: Boolean, + default: true + }, showAddCartBtn: { type: Boolean, default: true @@ -246,6 +250,16 @@ export default create({ }, computed: { + skuGroupClass() { + return [ + 'van-sku-group-container', + 'van-hairline--bottom', + { + 'van-sku-group-container--hide-soldout': !this.showSoldoutSku + } + ]; + }, + bodyStyle() { if (this.$isServer) { return; @@ -307,8 +321,9 @@ export default create({ } treeItem.v.forEach(vItem => { - if (vItem.imgUrl) { - imageList.push(vItem.imgUrl); + const img = vItem.imgUrl || vItem.img_url; + if (img) { + imageList.push(img); } }); } diff --git a/packages/sku/components/SkuHeader.vue b/packages/sku/components/SkuHeader.vue index 98eecf277..2015c3a38 100644 --- a/packages/sku/components/SkuHeader.vue +++ b/packages/sku/components/SkuHeader.vue @@ -54,14 +54,10 @@ export default create({ // 目前skuImg都挂载在skuTree中s1那类sku上 const treeItem = this.sku.tree.filter(item => item.k_s === 's1')[0] || {}; - if (!treeItem.v) { - return; - } + if (!treeItem.v) return; const matchedSku = treeItem.v.filter(skuValue => skuValue.id === id)[0]; - if (matchedSku && matchedSku.imgUrl) { - return matchedSku.imgUrl; - } + if (matchedSku) return (matchedSku.imgUrl || matchedSku.img_url); }, previewImage() { diff --git a/packages/sku/demo/data.js b/packages/sku/demo/data.js index ae05e224c..102c15c66 100644 --- a/packages/sku/demo/data.js +++ b/packages/sku/demo/data.js @@ -15,6 +15,10 @@ export default { name: '天蓝色', imgUrl: 'https://img.yzcdn.cn/upload_files/2017/02/21/FjKTOxjVgnUuPmHJRdunvYky9OHP.jpg!100x100.jpg' + }, + { + id: '1215', + name: '白色' } ], k_s: 's1', diff --git a/packages/sku/demo/index.vue b/packages/sku/demo/index.vue index 6b741af69..57cf9e9d1 100644 --- a/packages/sku/demo/index.vue +++ b/packages/sku/demo/index.vue @@ -1,5 +1,6 @@