From 2e03473873c6fdbaea7cbba8ea975b0b0fa31780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=8C=80=EC=9A=A9?= Date: Mon, 23 Nov 2020 11:38:46 +0900 Subject: [PATCH] Main Feed Sort and Face Error Former-commit-id: 43f9c306638fd7c014b15afb7dde5d194e7f6a4f [formerly 28d3d9e6b88a25c4057f65789d2446153f7a031a] [formerly 2f15013510d856a5bd82050370a3b9ff0e59daee [formerly 2113a6f297a53793769e6b3ae031230026cd3e32]] Former-commit-id: 1ddbf1cdb65e37cf9fe2f7df5ec707d68765a36f [formerly 991e1caae43498faef8fbbc3ecfdfb839b8be57f] Former-commit-id: 280cb369ec7e375a9019891fc429141ad1a813c4 --- frontend/RunWithMe/src/views/app/dashboards/main.vue | 3 ++- .../src/views/app/runnings/friendsDetail.vue | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frontend/RunWithMe/src/views/app/dashboards/main.vue b/frontend/RunWithMe/src/views/app/dashboards/main.vue index dada851c..01370cd4 100644 --- a/frontend/RunWithMe/src/views/app/dashboards/main.vue +++ b/frontend/RunWithMe/src/views/app/dashboards/main.vue @@ -416,7 +416,7 @@ export default { obj.runningId = data.data.runnings[i].runningId; obj.total_distance = data.data.runnings[i].accDistance.toFixed(2); obj.accumulcated_time = data.data.runnings[i].accTime; - obj.running_avg_pace = data.data.runnings[i].accTime / data.data.runnings[i].accDistance; + obj.running_avg_pace = (data.data.runnings[i].accDistance<0.01 || data.data.runnings[i].accTime<1)? 0: (data.data.runnings[i].accDistance*1000) / data.data.runnings[i].accTime; obj.mapImg = data.data.runnings[i].thumbnail; } obj.userId = data.data.friends[i].userId; @@ -431,6 +431,7 @@ export default { if(this.friendsFeed.length == 0) this.haveFriends = false; } + this.friendsFeed.reverse(); }) .catch((error) => { console.log(error); diff --git a/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue b/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue index b2d5e9e6..a84463bf 100644 --- a/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue +++ b/frontend/RunWithMe/src/views/app/runnings/friendsDetail.vue @@ -162,10 +162,10 @@ export default { return runningTime; }, convertToTime(origin) { - var time = ""; - time += parseInt(origin / 60) + "'"; - time += (origin % 60) + '"'; - return time; + var time = ""; + time += parseInt(origin/60) + "\'"; + time += (origin%60).toFixed() + "\""; + return time; }, isFollower() { // //console.log(this.friendInfo.userId); @@ -201,7 +201,7 @@ export default { obj.running_avg_pace = 0; } else { obj.running_avg_pace = ( - element.accDistance / element.accTime + (element.accDistance*1000) / element.accTime ).toFixed(2); } obj.acc_time_min = parseInt(obj.accumulcated_time / 60); @@ -213,7 +213,7 @@ export default { this.items.push(obj); }); } - // //console.log(this.items); + console.log(this.items); if (this.items.length == 0) { this.isRunning = false; }