Merge branch 'dev' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into dev

pages/feedingIndex/feedingIndex.vue

@@ -417,7 +417,7 @@
 		</view>
 	</uni-popup>
 
-	<popupTip v-if="isTip" type="1" @statusChange="onPopupTipBabyChange"  @close="isTip = false"></popupTip>
+	<popupTip v-if="isTip" type="1" @statusChange="onPopupTipBabyChange" @close="isTip = false"></popupTip>
 </template>
 
 <script setup>
@@ -427,7 +427,7 @@ import BabySwitchPopup from '@/components/BabySwitchPopup.vue'
 import popupTip from '../../components/popup-tip/popup-tip.vue'
 import { fetchFeedingJSON, feedingHome, feedingRecords, feedingFoodsCustom, feedingFoodsCustomAdd, feedingFoodsCustomDelete, feedingTimerStart, feedingTimerStop, feedingVoiceUpload, feedingVoiceResult } from '@/api/feeding.js'
 import { useUserStore } from '@/stores/user.js'
-import { jump, JumpType } from '../../utils'
+import { jump, JumpType, showLoading } from '../../utils'
 import { getHealthField } from "@/api/common";
 
 // 弹窗引用
@@ -656,7 +656,7 @@ const babyId = computed(() => userStore.babyInfo?.content?.id)
 // 宝宝切换相关状态
 const showBabySwitchPopup = ref(false)
 
-const isTip = ref(false)
+const isTip = ref(true)
 
 // 为每种喂养方式设置独立的数据 - 根据接口数据初始化
 const feedingData = ref({
@@ -751,9 +751,16 @@ const onPopupTipBabyChange = async () => {
 }
 
 // 页面显示时刷新数据
-onShow(() => {
+onShow(async () => {
 	console.log('页面显示，刷新数据...')
 
+	if (!babyId.value) {
+		isTip.value = true
+		await loadBabyInfo()
+	} else {
+		isTip.value = false
+	}
+
 	// 刷新宝宝信息和首页数据
 	loadHomeData()
 
@@ -916,7 +923,13 @@ function setFormDataFromRecord(recordData) {
 async function loadBabyInfo() {
 	try {
 		console.log('开始加载宝宝信息...')
-
+		if (userStore.babyInfo?.babyStage != 2) {
+			isTip.value = true
+			console.log('isTip', isTip.value)
+		} else {
+			isTip.value = false
+			console.log('宝宝信息加载完成')
+		}
 		// 使用全局状态管理加载宝宝信息
 		// 加载宝宝信息 - 由 userStore 管理
 		await userStore.loadBabyInfo()
@@ -926,6 +939,7 @@ async function loadBabyInfo() {
 			isTip.value = true
 			console.log('isTip', isTip.value)
 		} else {
+			isTip.value = false
 			console.log('宝宝信息加载完成')
 
 			// 加载宝宝信息后，加载首页数据
@@ -948,7 +962,10 @@ async function loadBabyInfo() {
 // 获取首页数据
 async function loadHomeData() {
 	if (!babyId.value) {
+		isTip.value = true
 		return
+	} else {
+		isTip.value = false
 	}
 	try {
 		const response = await feedingHome(babyId.value)