From d6331720b93d3390f7582fd9361ad1a3255d9b19 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Mon, 16 May 2022 14:42:26 +0800
Subject: [PATCH] 停车记录详情
---
common/common.js | 23 ++++++++++++++++++++---
pages/parkRecordList/recordDetail.vue | 96 ++++++++++++++++++++++++------------------------------------------------------------------------
2 files changed, 44 insertions(+), 75 deletions(-)
diff --git a/common/common.js b/common/common.js
index 8466f7c..615498d 100644
--- a/common/common.js
+++ b/common/common.js
@@ -115,27 +115,43 @@ var moneyFormat = function (val) {
return (val / 100).toFixed(2)
}
var dateFormat = function (msd) { // 时间转换
- var time = 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) -
+ 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;
}
@@ -150,6 +166,7 @@ export default {
SetToken,
requestSign,
moneyFormat,
+ dateFormat,
// 接口
userLogin,
indexInfo,
diff --git a/pages/parkRecordList/recordDetail.vue b/pages/parkRecordList/recordDetail.vue
index f236b97..2dbfac2 100644
--- a/pages/parkRecordList/recordDetail.vue
+++ b/pages/parkRecordList/recordDetail.vue
@@ -41,90 +41,40 @@
-
- 一次支付订单
-
- 实收:
- ¥10.00
-
-
- 应收:
- ¥10.00
-
-
- 支付金额:
- ¥10.00
-
-
- 支付方式:
- 商户余额
-
-
- 支付时间:
- 2022-04-05 20:20:20
-
-
- 订单编号:
- 1012321839678731
-
-
-
- 二次支付订单
-
- 实收:
- ¥10.00
-
-
- 应收:
- ¥10.00
-
-
- 支付金额:
- ¥10.00
-
-
- 支付方式:
- 商户余额
-
-
- 支付时间:
- 2022-04-05 20:20:20
-
-
- 订单编号:
- 1012321839678731
-
-
-
+
+ {{index+1}}次支付订单
-
优惠券:
- 5元金额券
+ {{$common.moneyFormat(i.orderDicountFee)}}元金额券
优惠:
- ¥5.00
+ ¥{{$common.moneyFormat(i.orderDicountFee)}}
应收:
- ¥10.00
+ ¥{{$common.moneyFormat(i.orderTotalFee)}}
实收:
- ¥10.00
+ ¥{{$common.moneyFormat(i.orderActFee)}}
支付金额:
- ¥10.00
+ ¥{{$common.moneyFormat(i.orderActFee)}}
支付方式:
商户余额
+ 支付时间:
+ {{i.payFinishTime}}
+
+
订单编号:
- 1012321839678731
+ {{i.rltOrderId}}
@@ -147,22 +97,23 @@ export default {
plName: '',// 停车场名称
parkOutTime: '',// 出场时间
parkInTime: '',// 入场时间
- parkingDuration: '',// 停车时长
+ parkingDuration: 3600,// 停车时长
carNumber: '',// 车牌号
+ listData:[],
}
},
onLoad(params) {
wx.showShareMenu({
withShareTicket: true
})
- // 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 = 3600
- // this.carNumber = option.carNumber
+ 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 = 3600
+ this.carNumber = option.carNumber
console.log(this.orderId)
this.getPayOrderByOrderId();
},
@@ -191,7 +142,7 @@ export default {
getPayOrderByOrderId() {
let that = this
let paramsData = {
- orderId: '101962015377023516672'
+ orderId: this.orderId
}
// 首页信息获取 接口
that.$myRequest({
@@ -200,6 +151,7 @@ export default {
data: that.$common.requestSign(paramsData)
}).then(res => {
console.log(res)
+ that.listData = res.data
})
},
bindDateChange: function (e) {
--
libgit2 0.21.4