From 51f091d64891e9915f30720c75aa15db72fe73d3 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Mon, 16 May 2022 11:49:13 +0800
Subject: [PATCH] 停车记录详情

---
 common/common.js                        | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 pages/parkRecordList/parkRecordList.vue | 10 ++++------
 pages/parkRecordList/recordDetail.vue   | 57 +++++++++++++++++++++------------------------------------
 3 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/common/common.js b/common/common.js
index 23a0a8a..986721f 100644
--- a/common/common.js
+++ b/common/common.js
@@ -124,6 +124,54 @@ var moneyFormat = function (val) {
 	return (val/100).toFixed(2)
 }
 
+var dateFormat = function (msd) {  // 时间转换
+  var time = msd
+
+  if (null != time && "" != time) {
+
+    if (time > 60 && time < 60 * 60) {
+
+      time = parseInt(time / 60.0) + "分钟" + parseInt((parseFloat(time / 60.0) -
+
+        parseInt(time / 60.0)) * 60) + "秒";
+
+    }
+
+    else if (time >= 60 * 60 && time < 60 * 60 * 24) {
+
+      time = parseInt(time / 3600.0) + "小时" + parseInt((parseFloat(time / 3600.0) -
+
+        parseInt(time / 3600.0)) * 60) + "分钟" +
+
+        parseInt((parseFloat((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60) -
+
+          parseInt((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60)) * 60) + "秒";
+
+    } else if (time >= 60 * 60 * 24) {
+
+      time = parseInt(time / 3600.0 / 24) + "天" + parseInt((parseFloat(time / 3600.0 / 24) -
+
+        parseInt(time / 3600.0 / 24)) * 24) + "小时" + parseInt((parseFloat(time / 3600.0) -
+
+        parseInt(time / 3600.0)) * 60) + "分钟" +
+
+        parseInt((parseFloat((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60) -
+
+          parseInt((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60)) * 60) + "秒";
+
+    }
+
+    else {
+
+      time = parseInt(time) + "秒";
+
+    }
+
+  }
+
+  return time;
+}
+
 export default {
 
 	// deviceInfo,
@@ -136,7 +184,7 @@ export default {
 	SetToken,
 	requestSign,
   moneyFormat,
-
+  dateFormat,
 	// 接口
 	userLogin,
 	indexInfo,
diff --git a/pages/parkRecordList/parkRecordList.vue b/pages/parkRecordList/parkRecordList.vue
index ce750b9..1599d13 100644
--- a/pages/parkRecordList/parkRecordList.vue
+++ b/pages/parkRecordList/parkRecordList.vue
@@ -28,7 +28,7 @@
         </view>
 
         <view v-if="recordList.length>0">
-            <view class="parkRecordWrap" v-for="(i, index) in recordList" @click="toRecordDetail(i.orderId)">
+            <view class="parkRecordWrap" v-for="(i, index) in recordList" @click="toRecordDetail(i)">
                 <view>
                     {{i.plName}}
                 </view>
@@ -59,8 +59,6 @@
 </template>
 
 <script>
-
-import common from "../../common/common";
 export default {
   data() {
     const currentDate = this.getDate({
@@ -120,10 +118,10 @@ export default {
         this.recordList = res.data.dataList
       })
     },
-    toRecordDetail: function(orderId){
-      console.log(orderId)
+    toRecordDetail: function(i){
+      // console.log(orderId)
       uni.navigateTo({
-        url: '../parkRecordList/recordDetail?orderId='+orderId
+        url: '../parkRecordList/recordDetail?optionData='+JSON.stringify(i)
       });
 
     },
diff --git a/pages/parkRecordList/recordDetail.vue b/pages/parkRecordList/recordDetail.vue
index 9989de4..32dc4a6 100644
--- a/pages/parkRecordList/recordDetail.vue
+++ b/pages/parkRecordList/recordDetail.vue
@@ -1,14 +1,14 @@
 <template>
     <view class="container">
 		
-        <view class="uni-title uni-common-pl recordCarNum">车牌号码:蒙D12312</view>
+        <view class="uni-title uni-common-pl recordCarNum">车牌号码:{{carNumber}}</view>
         <view class="uni-list" style="margin-bottom: 4px">
             <view class="uni-list-cell recordPadding">
                 <view class="uni-list-cell-left">
                     停车场地
                 </view>
                 <view class="uni-list-cell-db">
-                    金融物流港（原蒙东云计算）
+                    {{plName}}
                 </view>
             </view>
 
@@ -17,7 +17,7 @@
                     入场时间
                 </view>
                 <view class="uni-list-cell-db">
-                    2022-04-01 20:20:20
+                   <uni-dateformat :date="parkInTime" format="yyyy-MM-dd hh:mm:ss"></uni-dateformat>
                 </view>
             </view>
 
@@ -26,7 +26,7 @@
                     离场时间
                 </view>
                 <view class="uni-list-cell-db">
-                    2022-04-01 20:20:20
+                    <uni-dateformat :date="parkOutTime" format="yyyy-MM-dd hh:mm:ss"></uni-dateformat>
                 </view>
             </view>
 
@@ -35,40 +35,12 @@
                     停车时间
                 </view>
                 <view class="uni-list-cell-db">
-                    1天3小时20分钟
+                    {{$common.dateFormat(parkingDuration)}}
                 </view>
             </view>
         </view>
 
 
-        <!--<view class="parkRecordWrap">-->
-        <!--<view>-->
-        <!--金融物流港（原蒙东云计算）-->
-        <!--</view>-->
-        <!--<view class="recordCon">-->
-        <!--<text>蒙DL232112</text>-->
-        <!--<text>2022-03-20 20:20:20</text>-->
-        <!--</view>-->
-        <!--<view class="recordCon">-->
-        <!--<text>实收:10.00</text>-->
-        <!--<text>应收:10.00</text>-->
-        <!--</view>-->
-        <!--</view>-->
-
-
-        <!--<view class="parkRecordWrap">-->
-        <!--<view>-->
-        <!--金融物流港（原蒙东云计算）-->
-        <!--</view>-->
-        <!--<view class="recordCon">-->
-        <!--<text>蒙DL232112</text>-->
-        <!--<text>2022-03-20 20:20:20</text>-->
-        <!--</view>-->
-        <!--<view class="recordCon">-->
-        <!--<text>实收:10.00</text>-->
-        <!--<text>应收:10.00</text>-->
-        <!--</view>-->
-        <!--</view>-->
         <uni-list class="">
             <view class="uni-title uni-common-pl recordCarNum">一次支付订单</view>
             <view class="recordCon listPadding">
@@ -161,8 +133,6 @@
 </template>
 
 <script>
-import common from "../../common/common.js";
-import requestServer from "../../common/requestServer.js";
 export default {
   
   data() {
@@ -175,13 +145,28 @@ export default {
       userIsLogin: false,
       shownoFlag: 0,
       orderId:'',// 订单号
+      plName:'',// 停车场名称
+      parkOutTime:'',// 出场时间
+      parkInTime:'',// 入场时间
+      parkingDuration:'',// 停车时长
+      carNumber:'',// 车牌号
     }
   },
   onLoad(params) {
     wx.showShareMenu({
       withShareTicket: true
     })
-    this.orderId = params.orderId
+    console.log(params.optionData)
+    let option = JSON.parse(params.optionData)
+    this.orderId = option.orderId
+    this.plName = option.plName
+    this.parkOutTime = option.parkOutTime
+    this.parkInTime = option.parkInTime
+    this.parkingDuration = option.parkingDuration
+    this.carNumber = option.carNumber
+
+
+
     console.log(this.orderId)
     this.getPayOrderByOrderId();
   },
--
libgit2 0.21.4