diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue index dc0b605..010c7a0 100644 --- a/pageProduct/add-Product/add-Product.vue +++ b/pageProduct/add-Product/add-Product.vue @@ -68,12 +68,12 @@ - + - + @@ -90,7 +90,7 @@ --> - + @@ -540,7 +540,7 @@ --> - - - + + @@ -896,13 +897,13 @@ let proGroupVoGoodsIndex = undefined function refChooseGuigeOpen(skuList, groupIndex, goodsIndex) { + console.log(groupIndex, goodsIndex) proGroupVoIndex = groupIndex proGroupVoGoodsIndex = goodsIndex refChooseGuige.value.open(skuList) } function refChooseGuigeConfirm(sku) { - console.log(sku); FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuName = sku.specSnap || sku.name FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuId = sku.id proGroupVoIndex = undefined @@ -916,7 +917,7 @@ function proGroupVoAddGoods(index, arr) { proGroupVoIndex = index - if(!FormData.proGroupVo){ + if (!FormData.proGroupVo) { initDefaultProGroupVo() } if (FormData.groupType == 0) { @@ -945,7 +946,6 @@ } function refChooseGoodsConfirm(arr) { - console.log(arr); refChooseGoodsClose() arr = arr.map(v => { const { @@ -974,10 +974,8 @@ skuName: '' } }) - console.log(arr); - console.log(FormData.groupType); + if (FormData.groupType == 0) { - console.log(FormData.proGroupVo[0]); return FormData.proGroupVo[0].goods = arr } if (FormData.groupType == 1 && proGroupVoIndex !== undefined) { @@ -1235,8 +1233,8 @@ endTime: '', //每日销量上限, dayLimit: 0, - singleOrderLimit:0, - singlePeopleLimit:0, + singleOrderLimit: 0, + singlePeopleLimit: 0, type: 'normal', showType: ['table'], specsInfoName: '', @@ -1364,7 +1362,7 @@ res.specsInfoName = specsInfoName $goodsData = res skuList.list = res.skuList - res.showType=res.showType.split(',') + res.showType = res.showType.split(',') Object.assign(FormData, res) //多规格 if (res.typeEnum === 'sku') { @@ -1685,7 +1683,7 @@ } } if (type == 'package') { - if (groupType == 0&& FormData.proGroupVo[0].goods.length<=0) { + if (groupType == 0 && FormData.proGroupVo[0].goods.length <= 0) { // 固定套餐 return infoBox.showToast('套餐组合至少需要包含一种商品,请添加商品') } @@ -1719,7 +1717,7 @@ } const submitData = { ...FormData, - showType:FormData.showType.join(','), + showType: FormData.showType.join(','), proGroupVo: type != 'package' ? '' : FormData.proGroupVo, images: images, coverImg: images[0] || '', @@ -1745,6 +1743,15 @@ }) }) } + // 如果套餐没选择规格,默认选中第一条 + submitData.proGroupVo.forEach((res, index) => { + submitData.proGroupVo[index].goods.forEach(ele => { + if (!ele.skuId) { + ele.skuId = ele.skuList[0].id + ele.skuName = ele.skuList[0].specSnap || ele.skuList[0].name + } + }) + }) submitData.selectSpec = $addProduct(submitData).then(res => { infoBox.showSuccessToast('添加成功') @@ -1932,14 +1939,14 @@ watch(() => FormData.type, (newval) => { if (option.type == 'edit') { if (newval == $goodsData.type) { - if($goodsData.proGroupVo){ - FormData.proGroupVo = $goodsData.proGroupVo||[] - }else{ + if ($goodsData.proGroupVo) { + FormData.proGroupVo = $goodsData.proGroupVo || [] + } else { initDefaultProGroupVo() } } - if(FormData.groupType==null){ - FormData.groupType=0 + if (FormData.groupType == null) { + FormData.groupType = 0 } } else { if (newval == 'package') { @@ -2134,7 +2141,8 @@ flex-wrap: nowrap; justify-content: space-between; } - ::v-deep .typeEnum .u-checkbox-group--row{ + + ::v-deep .typeEnum .u-checkbox-group--row { flex-wrap: nowrap; justify-content: space-between; }