|
|
@@ -128,8 +128,9 @@ export const useFeedingPlanStore = defineStore('feeding-plan', () => {
|
|
|
return 1.2
|
|
|
}
|
|
|
|
|
|
+ // 未绝育成年猫/活跃:系数1.4(根据新规则从1.6调整为1.4)
|
|
|
if (pet.value.isActive && !pet.value.isSterilization && ageInMonths > 12) {
|
|
|
- return 1.6
|
|
|
+ return 1.4
|
|
|
}
|
|
|
|
|
|
if (feedingPlan.value.targetWeight < pet.value.weight) {
|
|
|
@@ -145,9 +146,12 @@ export const useFeedingPlanStore = defineStore('feeding-plan', () => {
|
|
|
|
|
|
const rer = ref(0)
|
|
|
|
|
|
- watch(() => pet.value.weight, () => {
|
|
|
- feedingPlan.value.targetWeight = calculateIdealWeight()
|
|
|
- rer.value = calculateRER(pet.value.weight)
|
|
|
+ // 监听体重和体型变化,重新计算理想体重和RER
|
|
|
+ // RER应该使用理想体重而不是当前体重
|
|
|
+ watch([() => pet.value.weight, () => pet.value.bodyType], () => {
|
|
|
+ const idealWeight = calculateIdealWeight()
|
|
|
+ feedingPlan.value.targetWeight = idealWeight
|
|
|
+ rer.value = calculateRER(idealWeight)
|
|
|
})
|
|
|
|
|
|
const feedingGoalOptions = [
|