|
@@ -916,13 +916,7 @@ components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnerg
|
|
|
},
|
|
},
|
|
|
loadHealthAlerts: function() {
|
|
loadHealthAlerts: function() {
|
|
|
var self = this
|
|
var self = this
|
|
|
- var familyId = uni.getStorageSync('currentFamilyId')
|
|
|
|
|
- if (!familyId) {
|
|
|
|
|
- var userInfo = uni.getStorageSync('userInfo')
|
|
|
|
|
- if (userInfo && userInfo.familyId) familyId = userInfo.familyId
|
|
|
|
|
- }
|
|
|
|
|
- if (!familyId) return
|
|
|
|
|
- getHealthAlerts(familyId).then(function(res) {
|
|
|
|
|
|
|
+ getHealthAlerts().then(function(res) {
|
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
|
self.healthAlerts = Array.isArray(res.data) ? res.data : []
|
|
self.healthAlerts = Array.isArray(res.data) ? res.data : []
|
|
|
} else {
|
|
} else {
|
|
@@ -934,13 +928,7 @@ components: { TabTransition, PageBanner, RadarChart, LoginGuideCard, FamilyEnerg
|
|
|
},
|
|
},
|
|
|
loadMilestones: function() {
|
|
loadMilestones: function() {
|
|
|
var self = this
|
|
var self = this
|
|
|
- var familyId = uni.getStorageSync('currentFamilyId')
|
|
|
|
|
- if (!familyId) {
|
|
|
|
|
- var userInfo = uni.getStorageSync('userInfo')
|
|
|
|
|
- if (userInfo && userInfo.familyId) familyId = userInfo.familyId
|
|
|
|
|
- }
|
|
|
|
|
- if (!familyId) return
|
|
|
|
|
- getMilestones(familyId, 30).then(function(res) {
|
|
|
|
|
|
|
+ getMilestones(30).then(function(res) {
|
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
|
self.milestones = Array.isArray(res.data) ? res.data : []
|
|
self.milestones = Array.isArray(res.data) ? res.data : []
|
|
|
} else {
|
|
} else {
|