|
|
@@ -76,8 +76,6 @@
|
|
|
|
|
|
<!-- 活动推荐（从首页移过来） -->
|
|
|
<DimensionActivities
|
|
|
- dimensionCode="action"
|
|
|
- :activities="dimensionActivities"
|
|
|
:isLoggedIn="true"
|
|
|
@activityClick="goActivityDetail"
|
|
|
@moreActivities="goMoreActivities" />
|
|
|
@@ -162,7 +160,7 @@
|
|
|
import PageBanner from '../../components/PageBanner.vue'
|
|
|
import FamilyMemberStrip from '../../components/FamilyMemberStrip.vue'
|
|
|
import DimensionActivities from '../../components/DimensionActivities.vue'
|
|
|
-import { getChildren, getChildRecords, getActivityList } from '../../utils/api.js'
|
|
|
+import { getChildren, getChildRecords } from '../../utils/api.js'
|
|
|
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -183,8 +181,7 @@ export default {
|
|
|
todayCheckedIn: false,
|
|
|
pendingTasks: 0,
|
|
|
activeChallenges: 0,
|
|
|
- mealCount: 0,
|
|
|
- dimensionActivities: []
|
|
|
+ mealCount: 0
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -207,21 +204,11 @@ export default {
|
|
|
this.memberId = options.memberId || ''
|
|
|
this.loadChildren()
|
|
|
this.loadTodoData()
|
|
|
- this.loadDimensionActivities()
|
|
|
},
|
|
|
methods: {
|
|
|
goPage: function(url) {
|
|
|
uni.navigateTo({ url: url })
|
|
|
},
|
|
|
- loadDimensionActivities: function() {
|
|
|
- var self = this
|
|
|
- getActivityList({ dimensionCode: '', page: 1, size: 3 }).then(function(res) {
|
|
|
- if (res && res.code === 200) {
|
|
|
- var rawData = res.data && (Array.isArray(res.data) ? res.data : (res.data.data || res.data.records || []))
|
|
|
- self.dimensionActivities = Array.isArray(rawData) ? rawData.slice(0, 3) : []
|
|
|
- }
|
|
|
- }).catch(function() { self.dimensionActivities = [] })
|
|
|
- },
|
|
|
goActivityDetail: function(act) {
|
|
|
uni.navigateTo({ url: '/pages/activity/activity-detail/activity-detail?id=' + act.id })
|
|
|
},
|
