diff --git a/api/appUser.js b/api/appUser.js index e31f7f9..b5c2114 100644 --- a/api/appUser.js +++ b/api/appUser.js @@ -150,6 +150,10 @@ export function getTasks(page = 1, page_size = 20) { return authRequest({ url: '/api/app/task-center/tasks', method: 'GET', data: { page, page_size } }) } +export function getTaskProgress(task_id, user_id) { + return authRequest({ url: `/api/app/task-center/tasks/${task_id}/progress/${user_id}`, method: 'GET' }) +} + export function getShipments(user_id, page = 1, page_size = 20) { return authRequest({ url: `/api/app/users/${user_id}/shipments`, method: 'GET', data: { page, page_size } }) } diff --git a/pages.json b/pages.json index a3526d7..81a4b4f 100644 --- a/pages.json +++ b/pages.json @@ -3,7 +3,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "uni-app" + "navigationBarTitleText": "柯大鸭" } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index b9cee59..9798364 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -9,11 +9,6 @@ 柯大鸭潮玩 - - 🔍 - 搜索商品 - - diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 18d6499..205ec80 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -330,48 +330,80 @@ × - - - - {{ getOverallProgress() }}% - 总完成率 - - - - - 已完成 {{ tasksList.filter(t => t.status === 2).length }} 个 + + + + 总完成率 + + {{ getOverallProgress() }} + % + + + + - - - 进行中 {{ tasksList.filter(t => t.status === 1).length }} 个 - - - - 未开始 {{ tasksList.filter(t => t.status === 0).length }} 个 + + + {{ tasksStats.done }} + 已完成 + + + {{ tasksStats.ongoing }} + 进行中 + + + {{ tasksStats.waiting }} + 未开始 + - 加载中... + + + + + + + + + + + + 📝 暂无任务 - - - {{ getTaskIcon(task.type) }} - - {{ task.title }} - {{ task.description }} - - 🏆 奖励: {{ task.reward }} + + + + {{ getTaskIcon(task.type || task.title || task.name) }} + + + + {{ task.title }} + {{ getTaskStatusText(task) }} + {{ task.description }} + + + 🏆 + {{ task.reward }} + + + + + + {{ getTaskProgressText(task) }} + + - - + + {{ getTaskBtnText(task) }} @@ -419,9 +451,9 @@