|
|
@@ -279,7 +279,7 @@ export default {
|
|
|
dismissReminder: function() { this.hasIncomplete = false },
|
|
|
handleProgressClick: function(item) {
|
|
|
if (!item || !item.key) return
|
|
|
- var m = { diet: '/pages/growth/diet-checkin', exercise: '/pages/growth/exercise-checkin', sleep: '/pages/growth/sleep-checkin', emotion: '/pages/growth/emotion-checkin' }
|
|
|
+ var m = { diet: '/pages/growth/diet-checkin', exercise: '/pages/growth/exercise-checkin', sleep: '/pages/growth/sleep-checkin', emotion: '/pages/growth/growth-emotion-checkin' }
|
|
|
var url = m[item.key]
|
|
|
if (url) uni.navigateTo({ url: url })
|
|
|
},
|
|
|
@@ -294,7 +294,7 @@ export default {
|
|
|
goMoreProducts: function() { uni.navigateTo({ url: '/pages/shop/index/index' }) },
|
|
|
goMoreArticles: function() { uni.navigateTo({ url: '/pages/article-center/index?dimension=action' }) },
|
|
|
goPage: function(url) { uni.navigateTo({ url: url }) },
|
|
|
- loadTrackingData: function(key) { return this.trackingData[key] || [] },
|
|
|
+ loadTrackingData: function(key) { return [] },
|
|
|
formatDateKey: function(dateVal) {
|
|
|
if (!dateVal) return ''
|
|
|
var d = parseDate(dateVal)
|
|
|
@@ -321,21 +321,16 @@ export default {
|
|
|
async loadProgressItems() {
|
|
|
var self = this
|
|
|
var items = []
|
|
|
- // 饮食记录：health/meal/list 返回当日记录数组
|
|
|
+ // 饮食记录：health/meal/list 返回当日记录数组
|
|
|
var dietDone = false
|
|
|
try {
|
|
|
var dParams = self.memberId ? { memberId: self.memberId } : {}
|
|
|
var dRes = await getHealthMealList(dParams)
|
|
|
var dList = (dRes.code === 200 && dRes.data) ? dRes.data : []
|
|
|
- self.trackingData.diet = []
|
|
|
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 (di < 5) {
|
|
|
- var foods = dr.foodNames || dr.mealContent || dr.notes || ''
|
|
|
- self.trackingData.diet.push({ _id: dr.id, _date: self.mealTypeLabel(dr.mealType), _content: foods || '已记录' })
|
|
|
- }
|
|
|
}
|
|
|
} catch(e) {}
|
|
|
items.push({ key: 'diet', icon: '🍽️', label: '饮食记录', done: dietDone, actionText: '补录' })
|
|
|
@@ -345,15 +340,10 @@ export default {
|
|
|
var eParams = self.memberId ? { memberId: self.memberId } : {}
|
|
|
var eRes = await getExerciseRecords(eParams)
|
|
|
var eList = (eRes.code === 200 && eRes.data) ? eRes.data : []
|
|
|
- self.trackingData.exercise = []
|
|
|
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 (ei < 5) {
|
|
|
- var eText = (er.exerciseType || '运动') + (er.durationMinutes ? ' ' + er.durationMinutes + '分钟' : '') + (er.caloriesBurned ? ' · ' + er.caloriesBurned + '千卡' : '')
|
|
|
- self.trackingData.exercise.push({ _id: er.id, _date: self.formatRecordDate(er.startTime || er.createdAt), _content: eText })
|
|
|
- }
|
|
|
}
|
|
|
} catch(e) {}
|
|
|
items.push({ key: 'exercise', icon: '🏃', label: '运动记录', done: exerciseDone, actionText: '记录' })
|
|
|
@@ -363,15 +353,10 @@ export default {
|
|
|
var sParams = self.memberId ? { memberId: self.memberId } : {}
|
|
|
var sRes = await getSleepRecords(sParams)
|
|
|
var sList = (sRes.code === 200 && sRes.data) ? sRes.data : []
|
|
|
- self.trackingData.sleep = []
|
|
|
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 (si < 5) {
|
|
|
- var sText = (sr.durationMinutes ? sr.durationMinutes + '分钟' : '') + (sr.qualityScore ? ' · 质量' + sr.qualityScore + '分' : '')
|
|
|
- self.trackingData.sleep.push({ _id: sr.id, _date: self.formatRecordDate(sr.sleepTime || sr.createdAt), _content: sText || '已记录' })
|
|
|
- }
|
|
|
}
|
|
|
} catch(e) {}
|
|
|
items.push({ key: 'sleep', icon: '😴', label: '睡眠记录', done: sleepDone, actionText: '记录' })
|
|
|
@@ -382,13 +367,10 @@ export default {
|
|
|
if (self.memberId) mParams.memberId = self.memberId
|
|
|
var mRes = await getEmotionCheckinList(mParams)
|
|
|
var mList = (mRes.code === 200 && mRes.data) ? mRes.data : []
|
|
|
- self.trackingData.emotion = []
|
|
|
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
|
|
|
- var mText = (mr.moodWeather || '') + (mr.moodScore ? ' · ' + mr.moodScore + '分' : '')
|
|
|
- self.trackingData.emotion.push({ _id: mr.id, _date: self.formatRecordDate(mr.checkinDate || mr.createdAt), _content: mText || (mr.note || '已记录') })
|
|
|
}
|
|
|
} catch(e) {}
|
|
|
items.push({ key: 'emotion', icon: '😊', label: '心情记录', done: emotionDone, actionText: '记录' })
|
iwt