From 2ad40a7990d9cd688a462999d6eb1accdac61ab2 Mon Sep 17 00:00:00 2001 From: Waiter Date: Thu, 2 Jul 2020 15:25:37 +0800 Subject: [PATCH] fix(Sku): add choosable check (#6674) * fix(Sku): add choosable check * fix(Sku): change code style * fix(Sku): change code style Co-authored-by: songweite --- src/sku/Sku.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/sku/Sku.js b/src/sku/Sku.js index dca1a8851..fcb497707 100644 --- a/src/sku/Sku.js +++ b/src/sku/Sku.js @@ -375,16 +375,15 @@ export default createComponent({ // 重置 selectedSku this.skuTree.forEach((item) => { - this.selectedSku[item.k_s] = - this.initialSku[item.k_s] || UNSELECTED_SKU_VALUE_ID; + this.selectedSku[item.k_s] = UNSELECTED_SKU_VALUE_ID; }); - - // 只有一个 sku 规格值时默认选中 this.skuTree.forEach((item) => { const key = item.k_s; - const valueId = item.v[0].id; + // 规格值只有1个时,优先判断 + const valueId = + item.v.length === 1 ? item.v[0].id : this.initialSku[key]; if ( - item.v.length === 1 && + valueId && isSkuChoosable(this.sku.list, this.selectedSku, { key, valueId }) ) { this.selectedSku[key] = valueId;