From 60393d7c9c89d393167d485584285275087e0df5 Mon Sep 17 00:00:00 2001
From: fuqiuchang <fuqc0815@163.com>
Date: Mon, 4 Jan 2021 20:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E6=95=88=E8=B5=B7=E5=A7=8B=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=92=8C=E6=AD=A2=E6=9C=9F=E5=8E=BB=E6=8E=89=E6=97=B6?=
 =?UTF-8?q?=E5=88=86=E7=A7=92=E5=92=8C=E5=91=A8=E6=9C=9F=E6=80=A7=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=AD=A2=E6=9C=9F=E9=9C=80=E8=A6=81=E5=87=8F=E5=8E=BB?=
 =?UTF-8?q?=E4=B8=80=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/pages/property/propertyFee/propertyFee.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/public/pages/property/propertyFee/propertyFee.html b/public/pages/property/propertyFee/propertyFee.html
index a2fca1569..881822f5e 100644
--- a/public/pages/property/propertyFee/propertyFee.html
+++ b/public/pages/property/propertyFee/propertyFee.html
@@ -62,11 +62,10 @@
                                 {{feeDetail.createTime}}
                             </td>
                             <td class="text-center">
-                                {{feeDetail.startTime}}
-                            </td>
-                            <td class="text-center">
-                                {{feeDetail.endTime}}
+                                {{vc.dateFormat(feeDetail.startTime)}}
                             </td>
+                            <td class="text-center" v-if="feeDetail.startTime >= feeDetail.endTime">{{vc.dateFormat(feeDetail.endTime)}}</td>
+                            <td class="text-center" v-else>{{vc.dateSub(vc.dateFormat(feeDetail.endTime),feeDetail.feeFlag)}}</td>
                             <td class="text-center">
                                 {{feeDetail.stateName}}
                             </td>