66666

components/quanyi/shengrili.vue

@@ -192,8 +192,16 @@ onMounted(async () => {
 		islogin.value = true
 	}
 
+
     if(userStore.babyInfo?.allBabyBaseInfo && userStore.babyInfo?.allBabyBaseInfo.length > 0){
-        hasBaby.value = true;
+
+        if (userStore.babyInfo?.allBabyBaseInfo?.some(baby => baby.babyStage == 2)) {
+
+            hasBaby.value = true;
+        }else{
+            hasBaby.value = false;
+            return;
+        }   
     }else{
         hasBaby.value = false;
         return;

views/Integral.vue

@@ -1585,17 +1585,28 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 
 	//babyStage 宝宝阶段  0备用 1孕中 2出生 ,null无数据
 	const gotoAddBaby = () => {
-		if(userStore.babyInfo?.allBabyBaseInfo?.length == 3){
-			//判断状态并切换
+		if (userStore.babyInfo?.allBabyBaseInfo?.some(baby => baby.babyStage == 2)) {
 
-			if (userStore.babyInfo?.allBabyBaseInfo?.some(baby => baby.babyStage === 2)) {
-				navigateTo("/pages/person/person?type=add");
+		}else{
+			if(userStore.babyInfo?.allBabyBaseInfo?.length == 3){
+				if (userStore.babyInfo?.allBabyBaseInfo?.some(baby => baby.babyStage == 1)) {
+					const baby = userStore.babyInfo?.allBabyBaseInfo?.find(baby => baby.babyStage == 1);
+					if (baby) {
+						navigateTo(`/pages/person/person?type=edit&id=${baby.id}`);
+					}
+				}else{
+					if(userStore.babyInfo?.allBabyBaseInfo?.some(baby => baby.babyStage == 0)){
+   						//跳转2状态的编辑页
+						   const baby = userStore.babyInfo?.allBabyBaseInfo?.find(baby => baby.babyStage == 0);
+							if (baby) {
+								navigateTo(`/pages/person/person?type=edit&id=${baby.id}`);
+							}
+				    }
+				}
 			}else{
-				
+				navigateTo("/pages/person/person?type=add");
 			}
-		}else{
-			navigateTo("/pages/person/person?type=add");
-		}
+		} 
 		
 	}