Commit a977d173 authored by spc's avatar spc

Merge branch 'jifenquanyi_gaiban_20250813' of...

Merge branch 'jifenquanyi_gaiban_20250813' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into jifenquanyi_gaiban_20250813
parents b77b75eb 1862a197
...@@ -143,7 +143,8 @@ const handleCouponClick = () => { ...@@ -143,7 +143,8 @@ const handleCouponClick = () => {
// 去升级按钮点击 // 去升级按钮点击
const handleUpgrade = async () => { const handleUpgrade = async () => {
emit('upgrade', { emit('upgrade', {
index: status1.value index: status1.value,
userStore:useUserStore()
}) })
} }
......
...@@ -2386,6 +2386,8 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -2386,6 +2386,8 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
const handleGoToShop_shengrili = async (data) => { const handleGoToShop_shengrili = async (data) => {
console.log('生日礼', data.index); console.log('生日礼', data.index);
// debugger;
const userStore = data.userStore;
if(!(userStore.babyInfo?.allBabyBaseInfo && userStore.babyInfo?.allBabyBaseInfo.length > 0) && islogin.value){ if(!(userStore.babyInfo?.allBabyBaseInfo && userStore.babyInfo?.allBabyBaseInfo.length > 0) && islogin.value){
//没有宝宝,跳转到添加宝宝页面 //没有宝宝,跳转到添加宝宝页面
if(itemIndex.value < 2){ if(itemIndex.value < 2){
...@@ -2394,6 +2396,17 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue'; ...@@ -2394,6 +2396,17 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
showShengriliTipPanel.value = true; showShengriliTipPanel.value = true;
} }
return; return;
}else{
if(userStore.babyInfo?.allBabyBaseInfo?.some(baby => baby.babyStage == 2)){
}else{
if(itemIndex.value < 2){
gotoGonglue();
}else{
showShengriliTipPanel.value = true;
}
return;
}
} }
switch(data.index){ switch(data.index){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment