Commit 95f08a3f authored by spc's avatar spc

321

parent 3fc0e829
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</view> </view>
</uni-datetime-picker> </uni-datetime-picker>
</view> </view>
<view class="stats-section"> <view class="stats-section" @click="goToFeedingAnalysis">
<image :src="feedingRecordRes.icon_analysis" class="stats-icon" /> <image :src="feedingRecordRes.icon_analysis" class="stats-icon" />
<text class="stats-btn"> 统计</text> <text class="stats-btn"> 统计</text>
</view> </view>
...@@ -87,7 +87,8 @@ ...@@ -87,7 +87,8 @@
</view> </view>
<view class="record-details"> <view class="record-details">
<!-- 母乳亲喂:显示左右时间,时间加粗 --> <!-- 母乳亲喂:显示左右时间,时间加粗 -->
<view v-if="record.type === '母乳亲喂' && (record.leftDuration || record.rightDuration)" class="duration-info"> <view v-if="record.type === '母乳亲喂' && (record.leftDuration || record.rightDuration)"
class="duration-info">
<view v-if="record.leftDuration" class="duration-text"> <view v-if="record.leftDuration" class="duration-text">
<text class="duration-label"></text> <text class="duration-label"></text>
<text class="duration-time">{{ record.leftDuration }}</text> <text class="duration-time">{{ record.leftDuration }}</text>
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
<text class="duration-time">{{ record.rightDuration }}</text> <text class="duration-time">{{ record.rightDuration }}</text>
</view> </view>
</view> </view>
<!-- 母乳瓶喂:显示总乳量 --> <!-- 母乳瓶喂:显示总乳量 -->
<view v-if="record.type === '母乳瓶喂' && record.amount" class="amount-info"> <view v-if="record.type === '母乳瓶喂' && record.amount" class="amount-info">
<view class="amount-text"> <view class="amount-text">
...@@ -105,7 +106,7 @@ ...@@ -105,7 +106,7 @@
<text class="amount-value">{{ record.amount }}</text> <text class="amount-value">{{ record.amount }}</text>
</view> </view>
</view> </view>
<!-- 奶粉喂养:显示总奶量 --> <!-- 奶粉喂养:显示总奶量 -->
<view v-if="record.type === '奶粉喂养' && record.amount" class="amount-info"> <view v-if="record.type === '奶粉喂养' && record.amount" class="amount-info">
<view class="amount-text"> <view class="amount-text">
...@@ -113,7 +114,7 @@ ...@@ -113,7 +114,7 @@
<text class="amount-value">{{ record.amount }}</text> <text class="amount-value">{{ record.amount }}</text>
</view> </view>
</view> </view>
<!-- 辅食:显示内容,超出显示... --> <!-- 辅食:显示内容,超出显示... -->
<view v-if="record.type === '辅食' && record.content" class="content-info"> <view v-if="record.type === '辅食' && record.content" class="content-info">
<view class="content-text">{{ record.content }}</view> <view class="content-text">{{ record.content }}</view>
...@@ -579,6 +580,12 @@ function editRecord(index) { ...@@ -579,6 +580,12 @@ function editRecord(index) {
}) })
} }
function goToFeedingAnalysis() {
uni.navigateTo({
url: '/pages/feedingAnalysis/feedingAnalysis'
})
}
function addFeedingRecord() { function addFeedingRecord() {
if (!currentSelectedDate.value) { if (!currentSelectedDate.value) {
uni.showToast({ uni.showToast({
...@@ -923,11 +930,11 @@ onMounted(() => { ...@@ -923,11 +930,11 @@ onMounted(() => {
cursor: not-allowed; cursor: not-allowed;
.date-text { .date-text {
color: #ccc; color: #bab5af;
} }
.record-indicator { .record-indicator {
background: #ddd; background: #bab5af;
} }
} }
...@@ -936,12 +943,12 @@ onMounted(() => { ...@@ -936,12 +943,12 @@ onMounted(() => {
cursor: pointer; cursor: pointer;
.date-text { .date-text {
color: #b0b0b0; color: #bab5af;
transition: all 0.2s ease; transition: all 0.2s ease;
} }
.record-indicator { .record-indicator {
background: #d0d0d0; background: #bab5af;
} }
&:hover { &:hover {
...@@ -1007,7 +1014,7 @@ onMounted(() => { ...@@ -1007,7 +1014,7 @@ onMounted(() => {
// 非当月未来日期样式(既是other-month又是future的情况) // 非当月未来日期样式(既是other-month又是future的情况)
&.other-month.future { &.other-month.future {
.date-text { .date-text {
color: #ddd; color: #bab5af;
} }
} }
...@@ -1168,12 +1175,12 @@ onMounted(() => { ...@@ -1168,12 +1175,12 @@ onMounted(() => {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 16rpx; // 进一步增加间距 gap: 16rpx; // 进一步增加间距
.duration-label { .duration-label {
font-size: 24rpx; font-size: 24rpx;
color: #666; color: #666;
} }
.duration-time { .duration-time {
font-size: 24rpx; font-size: 24rpx;
color: #333; color: #333;
...@@ -1189,12 +1196,12 @@ onMounted(() => { ...@@ -1189,12 +1196,12 @@ onMounted(() => {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 16rpx; // 进一步增加间距 gap: 16rpx; // 进一步增加间距
.amount-label { .amount-label {
font-size: 24rpx; font-size: 24rpx;
color: #666; color: #666;
} }
.amount-value { .amount-value {
font-size: 24rpx; font-size: 24rpx;
color: #333; color: #333;
...@@ -1236,7 +1243,7 @@ onMounted(() => { ...@@ -1236,7 +1243,7 @@ onMounted(() => {
background: #fff; background: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
z-index: 100; z-index: 10;
.add-btn-img { .add-btn-img {
width: 686rpx; width: 686rpx;
...@@ -1252,7 +1259,7 @@ onMounted(() => { ...@@ -1252,7 +1259,7 @@ onMounted(() => {
font-size: 32rpx; font-size: 32rpx;
color: #D4A574; color: #D4A574;
font-weight: 600; font-weight: 600;
z-index: 101; z-index: 11;
} }
&:active { &:active {
......
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