Commit e6d9ebb9 authored by spc's avatar spc

feeding

parent 631ca764
......@@ -1339,7 +1339,6 @@ function testApiIntegration() {
flex: 1;
position: relative;
padding: 0 10rpx;
cursor: pointer;
transition: all 0.3s ease;
......
......@@ -377,17 +377,16 @@
@change="onBabyChange" v-if="babyList.length > 1" />
<!-- 记录成功弹窗 -->
<uni-popup ref="successPopup" type="center" :mask-click="false" :show="true"
@close="showSuccessPopup = false">
<uni-popup ref="successPopup" type="center" :mask-click="false">
<view class="success-popup">
<image class="success-bg" :src="feedingIndexRes.add_suc_bg" mode="aspectFit" />
<view class="success-content">
<text class="success-title">记录成功</text>
<view class="success-buttons">
<image class="success-btn success-btn-jump" :src="feedingIndexRes.add_suc_btn_jump" mode="aspectFit"
@click="onSuccessJump" />
<image class="success-btn success-btn-close" :src="feedingIndexRes.add_suc_btn_close"
mode="aspectFit" @click="onSuccessClose" />
<image class="success-btn success-btn-jump" :src="feedingIndexRes.add_suc_btn_jump" mode="aspectFit"
@click="onSuccessJump" />
</view>
</view>
</view>
......@@ -403,6 +402,7 @@ import { useFeedStore } from '@/stores/feed.js'
// 弹窗引用
const addFoodPopup = ref(null)
const successPopup = ref(null)
const { proxy } = getCurrentInstance();
const $baseUrl = proxy.$baseUrl;
......@@ -570,8 +570,7 @@ const foodSelectionState = ref({
originalFoodData: null // 保存原始辅食数据,用于恢复
})
// 记录成功弹窗状态
const showSuccessPopup = ref(false)
// 记录成功弹窗状态 - 已移除,改用 .open() 和 .close() 方法
// 语音识别状态
const voiceRecognitionState = ref({
......@@ -1312,7 +1311,7 @@ function startLeftTimer() {
}
leftTimerInterval = setInterval(() => {
timerData.value.leftDuration++
// 检查是否达到60分钟上限,达到时自动暂停
if (timerData.value.leftDuration >= 3600) { // 3600秒 = 60分钟
console.log('左侧计时器达到60分钟上限,自动暂停')
......@@ -1340,7 +1339,7 @@ function startRightTimer() {
}
rightTimerInterval = setInterval(() => {
timerData.value.rightDuration++
// 检查是否达到60分钟上限,达到时自动暂停
if (timerData.value.rightDuration >= 3600) { // 3600秒 = 60分钟
console.log('右侧计时器达到60分钟上限,自动暂停')
......@@ -1458,9 +1457,9 @@ async function completeRecord() {
clearFeedingData()
// 显示成功弹窗
showSuccessPopup.value = true
successPopup.value.open()
} catch (error) {
......@@ -2515,7 +2514,7 @@ async function completeVoiceRecord() {
}
// 显示成功弹窗
showSuccessPopup.value = true
successPopup.value.open()
} catch (error) {
console.error('保存语音记录失败:', error)
......@@ -2536,17 +2535,14 @@ async function completeVoiceRecord() {
// 记录成功弹窗相关方法
function onSuccessJump() {
// 跳转到喂养记录页面
uni.navigateTo({
url: '/pages/feedingRecord/feedingRecord'
})
uni.navigateBack()
// 关闭弹窗
showSuccessPopup.value = false
successPopup.value.close()
}
function onSuccessClose() {
// 关闭弹窗
showSuccessPopup.value = false
successPopup.value.close()
}
// 检查是否有未完成的编辑操作
......@@ -3416,6 +3412,7 @@ function loadDefaultFoodsData() {
}
.success-content {
margin-top: 190rpx;
position: relative;
z-index: 2;
display: flex;
......@@ -3441,17 +3438,9 @@ function loadDefaultFoodsData() {
.success-btn {
width: 284rpx;
height: 94rpx;
cursor: pointer;
pointer-events: auto;
}
.success-btn-jump {
// 跳转按钮样式
}
.success-btn-close {
// 关闭按钮样式
}
}
}
}
......
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