|
|
@@ -274,7 +274,7 @@ import DimensionActivities from '../../components/DimensionActivities.vue'
|
|
|
import DimensionProducts from '../../components/DimensionProducts.vue'
|
|
|
import ArticleBookshelf from '../../components/ArticleBookshelf.vue'
|
|
|
import { healthCheckinList, getHealthMealList, getGrowthRecommendations, getExerciseRecords, getSleepRecords, getEmotionCheckinList, getCheckinList, getTodayTasks, reportAppEnter } from '../../utils/api.js'
|
|
|
-import { parseDate } from '../../utils/format.js'
|
|
|
+import { parseDate, recordDateOf } from '../../utils/format.js'
|
|
|
import fontScaleMixin from '@/mixins/font-scale.js'
|
|
|
import shareMixin from '../../components/share-mixin.js'
|
|
|
export default {
|
|
|
@@ -424,7 +424,7 @@ export default {
|
|
|
for (var di = 0; di < dList.length; di++) {
|
|
|
var dr = dList[di]
|
|
|
if (!dr) continue
|
|
|
- if (self.formatDateKey(dr.createdAt || dr.recordDate) === self.todayDate) dietDone = true
|
|
|
+ if (recordDateOf(dr) === self.todayDate) dietDone = true
|
|
|
}
|
|
|
} catch(e) {}
|
|
|
items.push({ key: 'diet', icon: '🍽️', label: '饮食', done: dietDone, actionText: '补录' })
|
|
|
@@ -436,7 +436,7 @@ export default {
|
|
|
for (var ei = 0; ei < eList.length; ei++) {
|
|
|
var er = eList[ei]
|
|
|
if (!er) continue
|
|
|
- if (self.formatDateKey(er.startTime || er.createdAt) === self.todayDate) exerciseDone = true
|
|
|
+ if (recordDateOf(er) === self.todayDate) exerciseDone = true
|
|
|
}
|
|
|
} catch(e) {}
|
|
|
items.push({ key: 'exercise', icon: '🏃', label: '运动', done: exerciseDone, actionText: '记录' })
|
|
|
@@ -448,7 +448,7 @@ export default {
|
|
|
for (var si = 0; si < sList.length; si++) {
|
|
|
var sr = sList[si]
|
|
|
if (!sr) continue
|
|
|
- if (self.formatDateKey(sr.sleepTime || sr.createdAt) === self.todayDate) sleepDone = true
|
|
|
+ if (recordDateOf(sr) === self.todayDate) sleepDone = true
|
|
|
}
|
|
|
} catch(e) {}
|
|
|
items.push({ key: 'sleep', icon: '😴', label: '睡眠', done: sleepDone, actionText: '记录' })
|
|
|
@@ -461,7 +461,7 @@ export default {
|
|
|
for (var mi = 0; mi < mList.length; mi++) {
|
|
|
var mr = mList[mi]
|
|
|
if (!mr) continue
|
|
|
- if (self.formatDateKey(mr.checkinDate || mr.createdAt) === self.todayDate) emotionDone = true
|
|
|
+ if (recordDateOf(mr) === self.todayDate) emotionDone = true
|
|
|
}
|
|
|
} catch(e) {}
|
|
|
items.push({ key: 'emotion', icon: '😊', label: '心情', done: emotionDone, actionText: '记录' })
|