|
|
@@ -503,6 +503,31 @@ export default {
|
|
|
this.unlockBadge(2)
|
|
|
}
|
|
|
|
|
|
+ // 按类别统计已完成任务次数,解锁对应徽章
|
|
|
+ var categoryCompletedCount = { '运动类': 0, '艺术类': 0, '家务类': 0 }
|
|
|
+ for (var i = 0; i < rawTasks.length; i++) {
|
|
|
+ var task = rawTasks[i]
|
|
|
+ if (task.status === 'completed') {
|
|
|
+ var cat = task.category || '其他'
|
|
|
+ if (cat === '运动类') {
|
|
|
+ categoryCompletedCount['运动类']++
|
|
|
+ } else if (cat === '艺术类') {
|
|
|
+ categoryCompletedCount['艺术类']++
|
|
|
+ } else if (cat === '家务类') {
|
|
|
+ categoryCompletedCount['家务类']++
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (categoryCompletedCount['运动类'] >= 5) {
|
|
|
+ this.unlockBadge(3)
|
|
|
+ }
|
|
|
+ if (categoryCompletedCount['艺术类'] >= 5) {
|
|
|
+ this.unlockBadge(4)
|
|
|
+ }
|
|
|
+ if (categoryCompletedCount['家务类'] >= 5) {
|
|
|
+ this.unlockBadge(5)
|
|
|
+ }
|
|
|
+
|
|
|
// 加载五维能量概览
|
|
|
var energyChildId = this.childId
|
|
|
if (energyChildId) {
|
|
|
@@ -579,9 +604,9 @@ export default {
|
|
|
// ======================== 导航方法 ========================
|
|
|
onDomainClick(evt) {
|
|
|
var code = evt && evt.code
|
|
|
- if (!code) return
|
|
|
+ if (!code || !this.childId) return
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/energy/detail?code=' + code
|
|
|
+ url: '/pages/energy/detail?childId=' + this.childId + '&code=' + code
|
|
|
})
|
|
|
},
|
|
|
goToRewards() {
|