From a6a95c57e38993887f3502eaffe96de099b5f5cc Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 9 Jan 2020 11:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=81=9C=E8=BD=A6=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/payParkingFeeList/payParkingFeeList.js   | 13 +++++++++++--
 pages/payParkingFeeList/payParkingFeeList.wxml |  2 +-
 utils/DateUtil.js                              | 17 ++++++++++++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/pages/payParkingFeeList/payParkingFeeList.js b/pages/payParkingFeeList/payParkingFeeList.js
index 19662dd..e40d80e 100644
--- a/pages/payParkingFeeList/payParkingFeeList.js
+++ b/pages/payParkingFeeList/payParkingFeeList.js
@@ -108,9 +108,18 @@ Page({
             for (let _psIndex = 0; _psIndex < _parkingSpaces.length; _psIndex++){
               _that._loadParkingSpaceFee(_parkingSpaces[_psIndex],function(_fee){
 
-                _parkingSpaces[_psIndex].endTime = _fee.endTime;
+                let _endTime = new Date(_fee.endTime);
+
+                _parkingSpaces[_psIndex].endTime = util.date.formatDate(_endTime);
+
                 
-                _parkingSpaces[_psIndex].stateName = '欠费'
+                let _now = new Date();
+                
+                if (_endTime > _now){
+                  _parkingSpaces[_psIndex].feeStateName = '正常'
+                }else{
+                  _parkingSpaces[_psIndex].feeStateName = '欠费'
+                }
                 _that.setData({
                   parkingSpaces: _parkingSpaces
                 });
diff --git a/pages/payParkingFeeList/payParkingFeeList.wxml b/pages/payParkingFeeList/payParkingFeeList.wxml
index 71a64f7..880facc 100644
--- a/pages/payParkingFeeList/payParkingFeeList.wxml
+++ b/pages/payParkingFeeList/payParkingFeeList.wxml
@@ -2,7 +2,7 @@
 
   <view class="block__title">停车费信息</view>
   <view class="ppfl_c"  wx:for="{{parkingSpaces}}" wx:for-index="idx" wx:for-item="item"  >
-    <van-panel title="{{item.num}}号停车位" desc="" status="{{item.stateName}}状态" use-footer-slot>
+    <van-panel title="{{item.num}}号停车位" desc="" status="{{item.feeStateName}}状态" use-footer-slot>
       <view class="ppfl_context">
         <van-row >
           <van-col span="5">车牌号码:</van-col>
diff --git a/utils/DateUtil.js b/utils/DateUtil.js
index 4c8b921..0980639 100644
--- a/utils/DateUtil.js
+++ b/utils/DateUtil.js
@@ -22,6 +22,20 @@ const formatTime = date => {
   return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':')
 }
 
+/**
+ * @desc: 格式化日期
+ * @return: eg: '2018/04/09 21:31:00'
+ * @param {Date对象} date 
+ */
+const formatDate = date => {
+
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+
+  return [year, month, day].map(formatNumber).join('-')
+}
+
 //字符串转日期格式，strDate要转为日期格式的字符串 
 const getDate = function getDate(strDate) {
   var st = strDate;
@@ -152,5 +166,6 @@ module.exports = {
   addHour: addHour,
   addMinutes: addMinutes,
   addSeconds: addSeconds,
-  getDate: getDate
+  getDate: getDate,
+  formatDate: formatDate
 }
\ No newline at end of file