添加商品如果套餐没选择规格,默认选中第一条
This commit is contained in:
@@ -68,12 +68,12 @@
|
|||||||
</uni-forms-item>
|
</uni-forms-item>
|
||||||
<view class="zhezhao u-absolute position-all" @click="canEditGoodsCategory(true)"
|
<view class="zhezhao u-absolute position-all" @click="canEditGoodsCategory(true)"
|
||||||
v-if="option.type=='edit'&&disabledChangeCategory">
|
v-if="option.type=='edit'&&disabledChangeCategory">
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view class="">
|
||||||
<uni-forms-item label="单位" required showRequired name="units">
|
<uni-forms-item label="单位" required showRequired name="units">
|
||||||
|
|
||||||
<uni-data-picker :clear-icon="false" @change="unitIdChange"
|
<uni-data-picker :clear-icon="false" @change="unitIdChange"
|
||||||
:map="{text:'name',value:'id'}" placeholder="请选择单位" popup-title="请选择单位"
|
:map="{text:'name',value:'id'}" placeholder="请选择单位" popup-title="请选择单位"
|
||||||
:localdata="pageData.units" v-model="FormData.unitId">
|
:localdata="pageData.units" v-model="FormData.unitId">
|
||||||
@@ -90,7 +90,7 @@
|
|||||||
</uni-data-picker>
|
</uni-data-picker>
|
||||||
</uni-forms-item>
|
</uni-forms-item>
|
||||||
</view> -->
|
</view> -->
|
||||||
|
|
||||||
<view class="border-top" v-if="FormData.proGroupVo">
|
<view class="border-top" v-if="FormData.proGroupVo">
|
||||||
<view class=""
|
<view class=""
|
||||||
v-if=" (FormData.groupType==1&&FormData.proGroupVo.length)||(FormData.groupType==0&&FormData.proGroupVo.length&&FormData.proGroupVo[0].goods.length) ">
|
v-if=" (FormData.groupType==1&&FormData.proGroupVo.length)||(FormData.groupType==0&&FormData.proGroupVo.length&&FormData.proGroupVo[0].goods.length) ">
|
||||||
@@ -540,7 +540,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</uni-forms-item>
|
</uni-forms-item>
|
||||||
</view> -->
|
</view> -->
|
||||||
<!-- <view class="border-top-0">
|
<!-- <view class="border-top-0">
|
||||||
<view class="u-flex u-row-between u-p-b-24 u-p-t-20">
|
<view class="u-flex u-row-between u-p-b-24 u-p-t-20">
|
||||||
<view class="label-title">是否允许临时改价</view>
|
<view class="label-title">是否允许临时改价</view>
|
||||||
<my-switch
|
<my-switch
|
||||||
@@ -584,7 +584,8 @@
|
|||||||
<view>
|
<view>
|
||||||
<view class="color-666">{{returnTimerDayText()}}</view>
|
<view class="color-666">{{returnTimerDayText()}}</view>
|
||||||
<view class="color-666 u-m-t-4" v-if="FormData.days">
|
<view class="color-666 u-m-t-4" v-if="FormData.days">
|
||||||
{{returnTimerTimeText()}}</view>
|
{{returnTimerTimeText()}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<uni-icons type="right"></uni-icons>
|
<uni-icons type="right"></uni-icons>
|
||||||
</view>
|
</view>
|
||||||
@@ -701,8 +702,8 @@
|
|||||||
<choose-guige ref="refChooseGuige" @confirm="refChooseGuigeConfirm"></choose-guige>
|
<choose-guige ref="refChooseGuige" @confirm="refChooseGuigeConfirm"></choose-guige>
|
||||||
<!-- 更多操作 -->
|
<!-- 更多操作 -->
|
||||||
<my-action-sheet @itemClick="actionSheetClick" ref="refMoreSheet" :list="actionSheet.list"></my-action-sheet>
|
<my-action-sheet @itemClick="actionSheetClick" ref="refMoreSheet" :list="actionSheet.list"></my-action-sheet>
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
@@ -896,13 +897,13 @@
|
|||||||
let proGroupVoGoodsIndex = undefined
|
let proGroupVoGoodsIndex = undefined
|
||||||
|
|
||||||
function refChooseGuigeOpen(skuList, groupIndex, goodsIndex) {
|
function refChooseGuigeOpen(skuList, groupIndex, goodsIndex) {
|
||||||
|
console.log(groupIndex, goodsIndex)
|
||||||
proGroupVoIndex = groupIndex
|
proGroupVoIndex = groupIndex
|
||||||
proGroupVoGoodsIndex = goodsIndex
|
proGroupVoGoodsIndex = goodsIndex
|
||||||
refChooseGuige.value.open(skuList)
|
refChooseGuige.value.open(skuList)
|
||||||
}
|
}
|
||||||
|
|
||||||
function refChooseGuigeConfirm(sku) {
|
function refChooseGuigeConfirm(sku) {
|
||||||
console.log(sku);
|
|
||||||
FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuName = sku.specSnap || sku.name
|
FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuName = sku.specSnap || sku.name
|
||||||
FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuId = sku.id
|
FormData.proGroupVo[proGroupVoIndex].goods[proGroupVoGoodsIndex].skuId = sku.id
|
||||||
proGroupVoIndex = undefined
|
proGroupVoIndex = undefined
|
||||||
@@ -916,7 +917,7 @@
|
|||||||
|
|
||||||
function proGroupVoAddGoods(index, arr) {
|
function proGroupVoAddGoods(index, arr) {
|
||||||
proGroupVoIndex = index
|
proGroupVoIndex = index
|
||||||
if(!FormData.proGroupVo){
|
if (!FormData.proGroupVo) {
|
||||||
initDefaultProGroupVo()
|
initDefaultProGroupVo()
|
||||||
}
|
}
|
||||||
if (FormData.groupType == 0) {
|
if (FormData.groupType == 0) {
|
||||||
@@ -945,7 +946,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function refChooseGoodsConfirm(arr) {
|
function refChooseGoodsConfirm(arr) {
|
||||||
console.log(arr);
|
|
||||||
refChooseGoodsClose()
|
refChooseGoodsClose()
|
||||||
arr = arr.map(v => {
|
arr = arr.map(v => {
|
||||||
const {
|
const {
|
||||||
@@ -974,10 +974,8 @@
|
|||||||
skuName: ''
|
skuName: ''
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
console.log(arr);
|
|
||||||
console.log(FormData.groupType);
|
|
||||||
if (FormData.groupType == 0) {
|
if (FormData.groupType == 0) {
|
||||||
console.log(FormData.proGroupVo[0]);
|
|
||||||
return FormData.proGroupVo[0].goods = arr
|
return FormData.proGroupVo[0].goods = arr
|
||||||
}
|
}
|
||||||
if (FormData.groupType == 1 && proGroupVoIndex !== undefined) {
|
if (FormData.groupType == 1 && proGroupVoIndex !== undefined) {
|
||||||
@@ -1235,8 +1233,8 @@
|
|||||||
endTime: '',
|
endTime: '',
|
||||||
//每日销量上限,
|
//每日销量上限,
|
||||||
dayLimit: 0,
|
dayLimit: 0,
|
||||||
singleOrderLimit:0,
|
singleOrderLimit: 0,
|
||||||
singlePeopleLimit:0,
|
singlePeopleLimit: 0,
|
||||||
type: 'normal',
|
type: 'normal',
|
||||||
showType: ['table'],
|
showType: ['table'],
|
||||||
specsInfoName: '',
|
specsInfoName: '',
|
||||||
@@ -1364,7 +1362,7 @@
|
|||||||
res.specsInfoName = specsInfoName
|
res.specsInfoName = specsInfoName
|
||||||
$goodsData = res
|
$goodsData = res
|
||||||
skuList.list = res.skuList
|
skuList.list = res.skuList
|
||||||
res.showType=res.showType.split(',')
|
res.showType = res.showType.split(',')
|
||||||
Object.assign(FormData, res)
|
Object.assign(FormData, res)
|
||||||
//多规格
|
//多规格
|
||||||
if (res.typeEnum === 'sku') {
|
if (res.typeEnum === 'sku') {
|
||||||
@@ -1685,7 +1683,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (type == 'package') {
|
if (type == 'package') {
|
||||||
if (groupType == 0&& FormData.proGroupVo[0].goods.length<=0) {
|
if (groupType == 0 && FormData.proGroupVo[0].goods.length <= 0) {
|
||||||
// 固定套餐
|
// 固定套餐
|
||||||
return infoBox.showToast('套餐组合至少需要包含一种商品,请添加商品')
|
return infoBox.showToast('套餐组合至少需要包含一种商品,请添加商品')
|
||||||
}
|
}
|
||||||
@@ -1719,7 +1717,7 @@
|
|||||||
}
|
}
|
||||||
const submitData = {
|
const submitData = {
|
||||||
...FormData,
|
...FormData,
|
||||||
showType:FormData.showType.join(','),
|
showType: FormData.showType.join(','),
|
||||||
proGroupVo: type != 'package' ? '' : FormData.proGroupVo,
|
proGroupVo: type != 'package' ? '' : FormData.proGroupVo,
|
||||||
images: images,
|
images: images,
|
||||||
coverImg: images[0] || '',
|
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 =
|
submitData.selectSpec =
|
||||||
$addProduct(submitData).then(res => {
|
$addProduct(submitData).then(res => {
|
||||||
infoBox.showSuccessToast('添加成功')
|
infoBox.showSuccessToast('添加成功')
|
||||||
@@ -1932,14 +1939,14 @@
|
|||||||
watch(() => FormData.type, (newval) => {
|
watch(() => FormData.type, (newval) => {
|
||||||
if (option.type == 'edit') {
|
if (option.type == 'edit') {
|
||||||
if (newval == $goodsData.type) {
|
if (newval == $goodsData.type) {
|
||||||
if($goodsData.proGroupVo){
|
if ($goodsData.proGroupVo) {
|
||||||
FormData.proGroupVo = $goodsData.proGroupVo||[]
|
FormData.proGroupVo = $goodsData.proGroupVo || []
|
||||||
}else{
|
} else {
|
||||||
initDefaultProGroupVo()
|
initDefaultProGroupVo()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(FormData.groupType==null){
|
if (FormData.groupType == null) {
|
||||||
FormData.groupType=0
|
FormData.groupType = 0
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (newval == 'package') {
|
if (newval == 'package') {
|
||||||
@@ -2134,7 +2141,8 @@
|
|||||||
flex-wrap: nowrap;
|
flex-wrap: nowrap;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
::v-deep .typeEnum .u-checkbox-group--row{
|
|
||||||
|
::v-deep .typeEnum .u-checkbox-group--row {
|
||||||
flex-wrap: nowrap;
|
flex-wrap: nowrap;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user