Skip to content

飞
飞鹤小程序
Commit dd9ee46f authored by spc's avatar spc
Browse files
Options

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

parents aee98d0a 2821ed8b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4016 additions and 178 deletions
components/DatePickerPopup.vue
View file @ dd9ee46f
...@@ -74,11 +74,11 @@ const props = defineProps({ ...@@ -74,11 +74,11 @@ const props = defineProps({
}, },
selectedDate: { selectedDate: {
type: String, type: String,
default: '2025-06-06' default: ''
}, },
babyBirthday: { babyBirthday: {
type: String, type: Number,
default: '2025-06-06' default: 0
} }
}) })
...@@ -98,10 +98,15 @@ const currentDate = ref(new Date(props.selectedDate)) ...@@ -98,10 +98,15 @@ const currentDate = ref(new Date(props.selectedDate))
const babyBirthday = ref(new Date(props.babyBirthday)) const babyBirthday = ref(new Date(props.babyBirthday))
// 生成年份范围 (2024-2030) // 生成年份范围 (2024-2030)
const yearRange = ref([]) const yearRange = computed(() => {
for (let i = babyBirthday.value.getFullYear(); i <= 2030; i++) { console.log('babyBirthday.value=',babyBirthday.value.getFullYear());
yearRange.value.push(i) const yearRange = []
} for (let i = babyBirthday.value.getFullYear(); i <= 2030; i++) {
yearRange.push(i)
}
return yearRange
})
// 生成月份范围 (1-12) // 生成月份范围 (1-12)
const monthRange = computed(() => { const monthRange = computed(() => {
......
components/shengzhangQuxianTipsPopup.vue
View file @ dd9ee46f
<template> <template>
<view v-if="visible" class="popup-overlay"> <cover-view v-if="visible" class="popup-overlay">
<view class="popup-content" @click.stop> <cover-view class="popup-content" @click.stop>
<!-- 关闭按钮 --> <!-- 关闭按钮 -->
<view class="close-btn" @click="closePopup"> <cover-view class="close-btn" @click="closePopup">
<image class="close-icon" :src="`${$baseUrl}shengzhangTool/1001/changeBaby/closeBtn.png`" mode="aspectFit"></image> <cover-image class="close-icon" :src="`${$baseUrl}shengzhangTool/1001/changeBaby/closeBtn.png`" mode="aspectFit"></cover-image>
</view> </cover-view>
<!-- 固定标题区域 --> <!-- 固定标题区域 -->
<view class="fixed-title"> <cover-view class="title-icon">
<view class="title-icon"> <cover-image class="icon-image" :src="`${$baseUrl}shengzhangTool/1001/tipsPopIcon.png`" mode="aspectFit"></cover-image>
<image class="icon-image" :src="`${$baseUrl}shengzhangTool/1001/tipsPopIcon.png`" mode="aspectFit"></image> </cover-view>
</view>
</view>
<!-- 弹窗内容 --> <!-- 弹窗内容 -->
<view class="popup-body"> <cover-view class="popup-body">
<!-- 第一段文字 --> <!-- 第一段文字 -->
<view class="content-section"> <cover-view class="content-section">
<text class="section-title">什么是生长曲线</text> <cover-view class="section-title">什么是生长曲线</cover-view>
<text class="content-text">生长曲线，就是把宝宝在每个成长节点测量的身高、体重、头围绘制在一个表格里，并形成一条曲线图，数据落在不同的区间内代表当前不同的发育情况。</text> <text class="content-text">生长曲线，就是把宝宝在每个成长节点测量的身高、体重、头围绘制在一个表格里，并形成一条曲线图，数据落在不同的区间内代表当前不同的发育情况。</text>
</view> </cover-view>
<!-- 图片区域 --> <!-- 图片区域 -->
<view class="image-section"> <cover-view class="image-section">
<image class="curve-image" :src="`${$baseUrl}shengzhangTestResult/1001/quxianTipsImg.png`" mode="aspectFit"></image> <cover-image class="curve-image" :src="`${$baseUrl}shengzhangTestResult/1001/quxianTipsImg.png`" mode="aspectFit"></cover-image>
</view> </cover-view>
<!-- 第二段文字 --> <!-- 第二段文字 -->
<view class="content-section"> <cover-view class="content-section">
<text class="section-title">生长曲线有什么作用</text> <cover-view class="section-title">生长曲线有什么作用</cover-view>
<text class="content-text">将宝宝的生长曲线与标准的生长曲线对比，可以看出宝宝当前的身高、体重、头围与全国儿童的标准值相比是偏高(大)还是偏低(偏小)。通过连续的生长曲线的趋势和变化状态，可以判断宝宝的体格发育是否正常，以及当前的基本健康状况。</text> <cover-view class="content-text">将宝宝的生长曲线与标准的生长曲线对比，可以看出宝宝当前的身高、体重、头围与全国儿童的标准值相比是偏高(大)还是偏低(偏小)。通过连续的生长曲线的趋势和变化状态，可以判断宝宝的体格发育是否正常，以及当前的基本健康状况。</cover-view>
</view> </cover-view>
<!-- 第三段文字 --> <!-- 第三段文字 -->
<view class="content-section"> <cover-view class="content-section">
<text class="section-title">生长曲线怎么使用</text> <cover-view class="section-title">生长曲线怎么使用</cover-view>
<text class="content-text">定期连续测量宝宝的身高、体重、头围数据，使用本软件测评即可。0-3岁儿童每月至少测量一次。</text> <cover-view class="content-text">定期连续测量宝宝的身高、体重、头围数据，使用本软件测评即可。0-3岁儿童每月至少测量一次。</cover-view>
</view> </cover-view>
</view> </cover-view>
<!-- 确认按钮 --> <!-- 确认按钮 -->
<view class="confirm-btn" @click="closePopup"> <cover-view class="confirm-btn" @click="closePopup">
<image class="btn-bg" :src="`${$baseUrl}shengzhangTool/1001/tipsOkBtn.png`" mode="aspectFit"></image> <cover-image class="btn-bg" :src="`${$baseUrl}shengzhangTool/1001/tipsOkBtn.png`" mode="aspectFit"></cover-image>
</view> </cover-view>
</view> </cover-view>
</view> </cover-view>
</template> </template>
<script setup> <script setup>
...@@ -108,39 +106,24 @@ const closePopup = () => { ...@@ -108,39 +106,24 @@ const closePopup = () => {
} }
} }
.fixed-title { .title-icon {
padding: 60rpx 40rpx 30rpx 40rpx; height: 90rpx;
display: flex; margin-top: 20rpx;
flex-direction: column;
align-items: center;
background-color: #ffffff;
.title-icon {
width: 79rpx;
height: 79rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.icon-image { .icon-image {
width: 100%;
height: 100%; width: 79rpx;
height: 79rpx;
} }
}
.title-text {
font-size: 30rpx;
color: #d3a358;
font-weight: bold;
line-height: 1.2;
text-align: center;
}
} }
.popup-body { .popup-body {
flex: 1; flex: 1;
padding: 0 40rpx 20rpx 40rpx; padding-left: 40rpx;
padding-right: 40rpx;
overflow-y: auto; overflow-y: auto;
} }
...@@ -181,10 +164,8 @@ const closePopup = () => { ...@@ -181,10 +164,8 @@ const closePopup = () => {
.confirm-btn { .confirm-btn {
position: relative; position: relative;
margin: 30rpx 40rpx 40rpx 40rpx; height: 150rpx;
height: 97rpx;
display: flex; display: flex;
align-items: center;
justify-content: center; justify-content: center;
.btn-bg { .btn-bg {
......
pages/shengzhangTools/shengzhangTools.vue
View file @ dd9ee46f
...@@ -271,7 +271,7 @@ const swiperData = ref([ ...@@ -271,7 +271,7 @@ const swiperData = ref([
const babyName = ref('宝宝名称') const babyName = ref('宝宝名称')
const babyAge = ref('8月龄') const babyAge = ref('8月龄')
const babyBirthday = ref('2024-10-20') const babyBirthday = ref('')
const babyGender = ref('M') const babyGender = ref('M')
const babyAvatar = ref(`https://course.feihe.com/momclub-picture/common/default_avatar.png`); const babyAvatar = ref(`https://course.feihe.com/momclub-picture/common/default_avatar.png`);
...@@ -730,6 +730,7 @@ const refreshBabyInfo = async () => { ...@@ -730,6 +730,7 @@ const refreshBabyInfo = async () => {
babyGender.value = data.gender; babyGender.value = data.gender;
babyAvatar.value = data.avatar babyAvatar.value = data.avatar
console.log('babyBirthday.value=',babyBirthday.value);
assessmentDate.value = selectedDate.value; assessmentDate.value = selectedDate.value;
feedingType.value = selectedFeedText.value; feedingType.value = selectedFeedText.value;
......
views/My.vue
View file @ dd9ee46f
...@@ -427,11 +427,11 @@ onMounted(async () => { ...@@ -427,11 +427,11 @@ onMounted(async () => {
console.log('babyIdsdfsdfsdfsdfsdfsdfdsfsdf=', babyId.value); console.log('babyIdsdfsdfsdfsdfsdfsdfdsfsdf=', babyId.value);
const a = { const a = {
"bgUrl": "my/babytest.png", "bgUrl": "my/shengzhangTools.png",
"desc": "生长测评", "desc": "生长测评",
"link": { "link": {
"type": 1, "type": 1,
"url": "/pages/shengzhangTools/shengzhangTools?babyId=" "url": "/pages/shengzhangTools/shengzhangTools"
}, },
"title": "生长测评" "title": "生长测评"
} }
......
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