|
@@ -83,8 +83,7 @@
|
|
|
<!-- 今日任务(仅当有 memberId 时显示) -->
|
|
<!-- 今日任务(仅当有 memberId 时显示) -->
|
|
|
<DimensionTasks
|
|
<DimensionTasks
|
|
|
v-if="memberId"
|
|
v-if="memberId"
|
|
|
- dimensionCode="all"
|
|
|
|
|
- :tasks="dimensionTasks"
|
|
|
|
|
|
|
+ :memberId="memberId"
|
|
|
@taskClick="onTaskClick"
|
|
@taskClick="onTaskClick"
|
|
|
@moreTasks="goTasks" />
|
|
@moreTasks="goTasks" />
|
|
|
|
|
|
|
@@ -111,7 +110,7 @@ import BodySection from '../../components/member-detail-sections/body-section.vu
|
|
|
import MindSection from '../../components/member-detail-sections/mind-section.vue'
|
|
import MindSection from '../../components/member-detail-sections/mind-section.vue'
|
|
|
import WisdomSection from '../../components/member-detail-sections/wisdom-section.vue'
|
|
import WisdomSection from '../../components/member-detail-sections/wisdom-section.vue'
|
|
|
import ActionSection from '../../components/member-detail-sections/action-section.vue'
|
|
import ActionSection from '../../components/member-detail-sections/action-section.vue'
|
|
|
-import { getFamilyEnergySandbox, getTodayTasksByCategory, getActivityList, getProductsByDomain, getChildren } from '../../utils/api.js'
|
|
|
|
|
|
|
+import { getFamilyEnergySandbox, getActivityList, getProductsByDomain, getChildren } from '../../utils/api.js'
|
|
|
|
|
|
|
|
// 维度配置
|
|
// 维度配置
|
|
|
var dimensionConfig = {
|
|
var dimensionConfig = {
|
|
@@ -136,7 +135,6 @@ export default {
|
|
|
selfId: null,
|
|
selfId: null,
|
|
|
memberInfo: null,
|
|
memberInfo: null,
|
|
|
sandboxData: null,
|
|
sandboxData: null,
|
|
|
- dimensionTasks: [],
|
|
|
|
|
dimensionActivities: [],
|
|
dimensionActivities: [],
|
|
|
dimensionProducts: [],
|
|
dimensionProducts: [],
|
|
|
loading: true,
|
|
loading: true,
|
|
@@ -304,16 +302,7 @@ export default {
|
|
|
// 2. 加载孩子列表(补充成员信息)
|
|
// 2. 加载孩子列表(补充成员信息)
|
|
|
self.loadChildren()
|
|
self.loadChildren()
|
|
|
|
|
|
|
|
- // 3. 加载今日任务(仅孩子类型)
|
|
|
|
|
- if (self.memberType === 'child' && self.targetMemberId) {
|
|
|
|
|
- getTodayTasksByCategory(self.targetMemberId, 'all').then(function(res) {
|
|
|
|
|
- if (res && res.data) {
|
|
|
|
|
- self.dimensionTasks = Array.isArray(res.data) ? res.data.slice(0, 5) : []
|
|
|
|
|
- }
|
|
|
|
|
- }).catch(function() { self.dimensionTasks = [] })
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- // 4. 加载推荐活动(非身卡片入口)
|
|
|
|
|
|
|
+ // 2. 加载推荐活动(非身卡片入口)
|
|
|
if (self.entrySource !== 'body-card') {
|
|
if (self.entrySource !== 'body-card') {
|
|
|
getActivityList({ dimensionCode: 'body', page: 1, size: 3 }).then(function(res) {
|
|
getActivityList({ dimensionCode: 'body', page: 1, size: 3 }).then(function(res) {
|
|
|
if (res && res.data) {
|
|
if (res && res.data) {
|
|
@@ -322,7 +311,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
}).catch(function() { self.dimensionActivities = [] })
|
|
}).catch(function() { self.dimensionActivities = [] })
|
|
|
|
|
|
|
|
- // 5. 加载推荐商品(非身卡片入口)
|
|
|
|
|
|
|
+ // 3. 加载推荐商品(非身卡片入口)
|
|
|
getProductsByDomain('body', 1, 4).then(function(res) {
|
|
getProductsByDomain('body', 1, 4).then(function(res) {
|
|
|
if (res && res.data) {
|
|
if (res && res.data) {
|
|
|
var list = Array.isArray(res.data) ? res.data : (res.data.records || [])
|
|
var list = Array.isArray(res.data) ? res.data : (res.data.records || [])
|