From 787b3b8951b2dbdb164b7dec82cb58daa16d9ccd Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 17 Dec 2019 16:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=88=B1=E5=BF=83=E6=97=B6=E9=95=BF=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/volunteerinfo.vue | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 7b16a5a2..ebe9ae97 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -19,12 +19,6 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
-        <!-- <el-form-item>
-          <el-button v-if="$hasPermission('user:volunteerinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('user:volunteerinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>-->
       </el-form>
       <el-table
         v-loading="dataListLoading"
@@ -38,13 +32,13 @@
         <!-- <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column> -->
         <el-table-column prop="fullName" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column
-          prop="sex"
+          prop="sex" width="140"
           label="性别"
           :formatter="sexState"
           header-align="center"
           align="center"
         ></el-table-column>
-        <el-table-column prop="birthdayString" label="出生日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="birthdayString" width="140" label="出生日期" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="identityNo" label="身份证" header-align="center" align="center"></el-table-column>
         <el-table-column prop="registTimeString" label="认证时间" header-align="center" align="center"></el-table-column>
@@ -55,7 +49,7 @@
           header-align="center"
           align="center"
         ></el-table-column>
-        <el-table-column prop="kindnessTime" label="爱心时长" header-align="center" 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" label="积分" header-align="center" align="center"></el-table-column>
         <el-table-column
           :label="$t('handle')"
@@ -245,6 +239,16 @@ 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) + '小时'
+      }
+    },
     // 审批状态转换
     auditStatusState: function (row, column) {
       let state = row.auditStatus