From 9fe2c81c4f139fd90be3d1e1aba2cabccb2f850c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 3 Apr 2020 17:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/volunteerinfo.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 1722ae64..345cf010 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -67,6 +67,7 @@
                          align="center"></el-table-column>
         <el-table-column prop="kindnessTime"
                          label="爱心时长"
+                         :formatter="kindnessTimeState"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="points"
@@ -251,16 +252,15 @@ export default {
         return '男'
       }
     },
-    // // 爱心时长分钟转小时
-    // kindnessTimeState: function (row, column) {
-    //   var state = row.kindnessTime
-    //   if (state === 0) {
-    //     return '0小时'
-    //   } else {
-    //     var h = state / 60
-    //     return h.toFixed(2) + '小时'
-    //   }
-    // },
+    // 爱心时长分钟转小时
+    kindnessTimeState: function (row, column) {
+      var state = row.kindnessTime
+      if (state === 0) {
+        return '0小时'
+      } else {
+        return state + '小时'
+      }
+    },
     // 审批状态转换
     auditStatusState: function (row, column) {
       let state = row.auditStatus