diff --git a/littleApp_child/packageA/pages/messageContent/messageContent.js b/littleApp_child/packageA/pages/messageContent/messageContent.js
index 2c57aea..762a369 100644
--- a/littleApp_child/packageA/pages/messageContent/messageContent.js
+++ b/littleApp_child/packageA/pages/messageContent/messageContent.js
@@ -8,7 +8,8 @@ Page({
* 页面的初始数据
*/
data: {
- setObject:{}
+ setObject:{},
+ isModalVisible: false,
},
/**
@@ -20,6 +21,16 @@ Page({
this.getmessageContent(id)
}
},
+ showModal: function() {
+ this.setData({
+ isModalVisible: true,
+ });
+ },
+ delModal: function() {
+ this.setData({
+ isModalVisible: false,
+ });
+ },
getmessageContent:function(id){
const _that = this
networkUtil._get(api.getBabyMsgById,{
diff --git a/littleApp_child/packageA/pages/messageContent/messageContent.wxml b/littleApp_child/packageA/pages/messageContent/messageContent.wxml
index 89c1611..1c1474a 100644
--- a/littleApp_child/packageA/pages/messageContent/messageContent.wxml
+++ b/littleApp_child/packageA/pages/messageContent/messageContent.wxml
@@ -17,8 +17,14 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/littleApp_child/packageA/pages/messageContent/messageContent.wxss b/littleApp_child/packageA/pages/messageContent/messageContent.wxss
index 70fd370..7381501 100644
--- a/littleApp_child/packageA/pages/messageContent/messageContent.wxss
+++ b/littleApp_child/packageA/pages/messageContent/messageContent.wxss
@@ -50,4 +50,19 @@
.content .content1{
margin-bottom: 50rpx;
-}
\ No newline at end of file
+}
+.addd{
+ width: 100%;
+ min-height:30px;
+}
+.modal {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: rgba(0, 0, 0, 0.5);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
\ No newline at end of file
diff --git a/littleApp_child/pages/diet/measuret.js b/littleApp_child/pages/diet/measuret.js
index 75c039d..a399458 100644
--- a/littleApp_child/pages/diet/measuret.js
+++ b/littleApp_child/pages/diet/measuret.js
@@ -686,7 +686,7 @@ Page({
})
wx.showModal({
title: '成功提交',
- content: '检查信息已提交!',
+ content: '膳食记录已提交!',
showCancel: false
});
}else{
@@ -767,6 +767,12 @@ Page({
foodList3:list3
})
if(app.globalData.userInfo.hospitalId==666668){
+ if(app.globalData.userInfo.monthage.includes("岁")){
+ this.setData({
+ yl:13
+ })
+ return
+ }
if(app.globalData.userInfo.monthage.includes("月")){
let yl=this.getLeadingNumbers(app.globalData.userInfo.monthage)
this.setData({
diff --git a/littleApp_child/pages/home/css/AboutPage.wxss b/littleApp_child/pages/home/css/AboutPage.wxss
index 486206e..9d432a8 100644
--- a/littleApp_child/pages/home/css/AboutPage.wxss
+++ b/littleApp_child/pages/home/css/AboutPage.wxss
@@ -2,7 +2,7 @@
.we_topImg {
width: 100%;
- height: 30%;
+ height: 25%;
}
.we_icon {
diff --git a/littleApp_child/pages/weightReportList/weightReportList.js b/littleApp_child/pages/weightReportList/weightReportList.js
index 521396d..39bf8bd 100644
--- a/littleApp_child/pages/weightReportList/weightReportList.js
+++ b/littleApp_child/pages/weightReportList/weightReportList.js
@@ -8,18 +8,19 @@ Page({
* 页面的初始数据
*/
data: {
- listData:[]
+ listData:[],
+ babyId:''
},
// 获取膳食检查列表
getBabyNutritionList:function(){
let self = this;
- networkUtil._get(api.getBabyNutritionList, {}, res => {
+ networkUtil._get(api.getBabyNutritionList, {babyId:self.data.babyId}, res => {
if (res.statusCode == 200 && res.data.errorcode == 0) {
var data = res.data.data;
if (data.length<=0){
wx.showModal({
title: '提醒',
- content: '为查询到历史报告信息',
+ content: '未查询到历史报告信息',
showCancel: false
});
return
@@ -35,6 +36,9 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ this.setData({
+ babyId:wx.getStorageSync('erid')
+ })
this.getBabyNutritionList()
},
diff --git a/littleApp_child/pages/weightReportList/weightReportList.wxml b/littleApp_child/pages/weightReportList/weightReportList.wxml
index 1107a5b..d5e0122 100644
--- a/littleApp_child/pages/weightReportList/weightReportList.wxml
+++ b/littleApp_child/pages/weightReportList/weightReportList.wxml
@@ -4,3 +4,7 @@
记录时间{{item.recordTime}} 月龄{{item.monthAge}}
+
+ 贴心提醒:
+ 待医院医生确认即可查看膳食报告
+
\ No newline at end of file