czg_team/cashier_admin_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码合并

Browse Source
This commit is contained in:
YeMingfei666
2024-11-29 14:01:16 +08:00
parent fb2ac1f7c1 e17d36bc88
commit c185dcc3be
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pageProduct/add-Product/add-Product.vue
View File

@@ -94,7 +94,7 @@
</view> --> </view> -->
<view class="border-top" > <view class="border-top" >
<view class="" <view class=""
v-if="(FormData.groupType==1&&FormData.proGroupVo.length)||(FormData.groupType==0&&FormData.proGroupVo[0].goods.length) "> v-if=" (FormData.groupType==1&&FormData.proGroupVo.length)||(FormData.groupType==0&&FormData.proGroupVo.length&&FormData.proGroupVo[0].goods.length) ">
<view class="border-bottom u-p-b-32" <view class="border-bottom u-p-b-32"
v-for="(item,index) in FormData.proGroupVo" :key="index"> v-for="(item,index) in FormData.proGroupVo" :key="index">
<view class=" u-p-t-24" v-if="FormData.groupType==1"> <view class=" u-p-t-24" v-if="FormData.groupType==1">
@@ -658,7 +658,7 @@
</view> </view>
</template> </template>
</uni-forms> </uni-forms>
<view style="height: 200rpx;"></view> <view style="height: 100rpx;"></view>
<view style="padding-left: 110rpx;padding-right: 110rpx;" class="u-m-t-20" <view style="padding-left: 110rpx;padding-right: 110rpx;" class="u-m-t-20"
v-if="option.type==='edit'" @click="delModelShow"> v-if="option.type==='edit'" @click="delModelShow">
<my-button bgColor="#F9F9F9" shape="circle" type="cancel"> <my-button bgColor="#F9F9F9" shape="circle" type="cancel">
@@ -915,6 +915,9 @@
function proGroupVoAddGoods(index, arr) { function proGroupVoAddGoods(index, arr) {
proGroupVoIndex = index proGroupVoIndex = index
if(!FormData.proGroupVo){
initDefaultProGroupVo()
}
if (FormData.groupType == 0) { if (FormData.groupType == 0) {
const goods = FormData.proGroupVo[0].goods const goods = FormData.proGroupVo[0].goods
refChooseGoods.value.open(goods) refChooseGoods.value.open(goods)
@@ -971,7 +974,9 @@
} }
}) })
console.log(arr); 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) {
@@ -1924,7 +1929,11 @@
watch(() => FormData.type, (newval) => { watch(() => FormData.type, (newval) => {
if (option.type == 'edit') { if (option.type == 'edit') {
if (newval == $goodsData.type) { if (newval == $goodsData.type) {
FormData.proGroupVo = $goodsData.proGroupVo if($goodsData.proGroupVo){
FormData.proGroupVo = $goodsData.proGroupVo||[]
}else{
initDefaultProGroupVo()
}
} }
} else { } else {
if (newval == 'package') { if (newval == 'package') {
@@ -1941,6 +1950,7 @@
number: 1, number: 1,
goods: [] goods: []
}] }]
console.log(FormData.proGroupVo);
} }
watch(() => FormData.groupType, (newval) => { watch(() => FormData.groupType, (newval) => {
if (newval == 0) { if (newval == 0) {
@@ -2090,8 +2100,7 @@
position: fixed; position: fixed;
left: 110rpx; left: 110rpx;
right: 110rpx; right: 110rpx;
bottom: 140rpx; bottom: 60px;
padding-bottom: env(safe-area-inset-bottom);
} }
.minus {} .minus {}