@@ -19,9 +19,9 @@ Page({ | |||||
*/ | */ | ||||
onLoad(options) { | onLoad(options) { | ||||
const detail = JSON.parse(options.item) | const detail = JSON.parse(options.item) | ||||
detail.payTime = this.timestampToTime(detail.payTime) | |||||
detail.createTime = this.timestampToTime(detail.createTime) | |||||
detail.updateTime = this.timestampToTime(detail.updateTime) | |||||
detail.payTime = this.timestampToTime(detail.payTime, 'YYYY-MM-DD hh:mm:ss') | |||||
detail.createTime = this.timestampToTime(detail.createTime, 'YYYY-MM-DD hh:mm:ss') | |||||
detail.updateTime = this.timestampToTime(detail.updateTime, 'YYYY-MM-DD hh:mm:ss') | |||||
this.setData({ | this.setData({ | ||||
detail: detail | detail: detail | ||||
}) | }) | ||||
@@ -23,10 +23,7 @@ | |||||
车场订单号:{{detail.parkOrderNo}} | 车场订单号:{{detail.parkOrderNo}} | ||||
</view> | </view> | ||||
<view> | <view> | ||||
商户收款账户:{{detail.merchantAccount}} | |||||
</view> | |||||
<view> | |||||
商户编号:{{detail.merchantId}} | |||||
商户收款账户:{{detail.merchantAccount}}(尾号) | |||||
</view> | </view> | ||||
<view> | <view> | ||||
商户名称:{{detail.merchantName}} | 商户名称:{{detail.merchantName}} | ||||
@@ -11,7 +11,40 @@ Page({ | |||||
*/ | */ | ||||
data: { | data: { | ||||
navigationBarHeight, | navigationBarHeight, | ||||
carPayOrderList: [], | |||||
carPayOrderList: [ | |||||
{ | |||||
carNumber: '鄂A636VV', | |||||
payAmount: '55元', | |||||
payTime: '2023-2-20', | |||||
createTime: '2023-2-20', | |||||
updateTime: '2023-2-20', | |||||
parkNotify: 1 | |||||
}, | |||||
{ | |||||
carNumber: '鄂A636VV', | |||||
payAmount: '55元', | |||||
payTime: '2023-2-20', | |||||
createTime: '2023-2-20', | |||||
updateTime: '2023-2-20', | |||||
parkNotify: 1 | |||||
}, | |||||
{ | |||||
carNumber: '鄂A636VV', | |||||
payAmount: '55元', | |||||
payTime: '2023-2-20', | |||||
createTime: '2023-2-20', | |||||
updateTime: '2023-2-20', | |||||
parkNotify: 0 | |||||
}, | |||||
{ | |||||
carNumber: '鄂A636VV', | |||||
payAmount: '55元', | |||||
payTime: '1676877157', | |||||
createTime: '1676877157', | |||||
updateTime: '1676877157', | |||||
parkNotify: 1 | |||||
}, | |||||
], | |||||
pageNum: '1' | pageNum: '1' | ||||
}, | }, | ||||
@@ -21,6 +54,10 @@ Page({ | |||||
url: config.api.carPayOrderList + `?pageNum=${pageNum}&pageSize=10`, | url: config.api.carPayOrderList + `?pageNum=${pageNum}&pageSize=10`, | ||||
}).then(res => { | }).then(res => { | ||||
console.log(res, 'res'); | console.log(res, 'res'); | ||||
res.data.list.forEach(item => { | |||||
item.payTime = this.timestampToTime(item.payTime) | |||||
item.createTime = this.timestampToTime(item.createTime) | |||||
}) | |||||
if (pageNum == 1) { | if (pageNum == 1) { | ||||
const tempArr = res.data.list | const tempArr = res.data.list | ||||
tempArr.forEach(item => { | tempArr.forEach(item => { | ||||
@@ -56,11 +93,58 @@ Page({ | |||||
}) | }) | ||||
}, | }, | ||||
/** | |||||
* @description 根据时间戳获取时间 | |||||
* @param {*} timestamp 必传,number类型,时间戳数据(10位及以下,10位至13位) | |||||
* @param {*} format 选传,string类型,提供以下时间格式:YYYY-MM-DD hh:mm:ss、YYYY/MM/DD hh:mm:ss、YYYY.MM.DD hh:mm:ss、YYYY MM DD hh:mm:ss、YYYY年MM月DD日 hh:mm:ss、YYYY-MM-DD、YYYY/MM/DD、YYYY.MM.DD、YYYY MM DD、YYYY年MM月DD日;若不传,则默认为:YYYY-MM-DD | |||||
* @returns 根据要求的时间格式 | |||||
* @version V 1.0, Created by YWQ, 2022.10.20 | |||||
*/ | |||||
timestampToTime(timestamp, format) { | |||||
//时间戳为10位需*1000,时间戳为13位不需乘1000 | |||||
const length = timestamp.length | |||||
if (length <= 10) { | |||||
var date = new Date(timestamp * 1000) | |||||
} else { | |||||
var date = new Date(timestamp) | |||||
} | |||||
let Y = String(date.getFullYear()) | |||||
let M = String(date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) | |||||
let D = String(date.getDate() + 1 < 10 ? '0' + (date.getDate()) : date.getDate()) | |||||
let h = String(date.getHours() + 1 < 10 ? '0' + (date.getHours()) : date.getHours()) | |||||
let m = String(date.getMinutes() + 1 < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) | |||||
let s = String(date.getSeconds() + 1 < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) | |||||
// return Y + M + D + h + m + s | |||||
if (format == "YYYY-MM-DD hh:mm:ss") { | |||||
return Y + "-" + M + "-" + D + " " + h + ":" + m + ":" + s | |||||
} else if (format == "YYYY/MM/DD hh:mm:ss") { | |||||
return Y + "/" + M + "/" + D + " " + h + ":" + m + ":" + s | |||||
} else if (format == "YYYY.MM.DD hh:mm:ss") { | |||||
return Y + "." + M + "." + D + " " + h + ":" + m + ":" + s | |||||
} else if (format == "YYYY MM DD hh:mm:ss") { | |||||
return Y + " " + M + " " + D + " " + h + ":" + m + ":" + s | |||||
} else if (format == "YYYY年MM月DD日 hh:mm:ss") { | |||||
return Y + "年" + M + "月" + D + "日" + " " + h + ":" + m + ":" + s | |||||
} else if (format == "YYYY-MM-DD") { | |||||
return Y + "-" + M + "-" + D | |||||
} else if (format == "YYYY/MM/DD") { | |||||
return Y + "/" + M + "/" + D | |||||
} else if (format == "YYYY.MM.DD") { | |||||
return Y + "." + M + "." + D | |||||
} else if (format == "YYYY MM DD") { | |||||
return Y + " " + M + " " + D | |||||
} else if (format == "YYYY年MM月DD日") { | |||||
return Y + "年" + M + "月" + D + "日" | |||||
} else { | |||||
return Y + "-" + M + "-" + D | |||||
} | |||||
}, | |||||
/** | /** | ||||
* 生命周期函数--监听页面加载 | * 生命周期函数--监听页面加载 | ||||
*/ | */ | ||||
onLoad(options) { | onLoad(options) { | ||||
this.getList(this.data.pageNum) | |||||
// this.getList(this.data.pageNum) | |||||
}, | }, | ||||
/** | /** | ||||
@@ -4,8 +4,16 @@ | |||||
<view class="item" wx:for="{{carPayOrderList}}" wx:key="index"> | <view class="item" wx:for="{{carPayOrderList}}" wx:key="index"> | ||||
<view data-item="{{item}}" bindtap="goDetial"> | <view data-item="{{item}}" bindtap="goDetial"> | ||||
<view class="child">车牌号:{{item.carNumber}}</view> | <view class="child">车牌号:{{item.carNumber}}</view> | ||||
<view class="child">支付金额:{{item.payAmount}}</view> | |||||
<view>支付时间:{{item.payTime}}</view> | |||||
<view class="payInfo"> | |||||
<image class="parking" src="../../../assets/images/parking.png" mode="" /> | |||||
<view class="time"> | |||||
<view>创建时间:{{item.createTime}}</view> | |||||
<view>支付时间:{{item.payTime}}</view> | |||||
</view> | |||||
</view> | |||||
<view class="payFee">支付金额:<text class="highLight">{{item.payAmount}}</text></view> | |||||
<view class="detail"> | <view class="detail"> | ||||
查看详情 | 查看详情 | ||||
</view> | </view> | ||||
@@ -1,36 +1,70 @@ | |||||
/* pages/passCar/showList.wxss */ | /* pages/passCar/showList.wxss */ | ||||
page { | |||||
background-color: #dfdfdf; | |||||
} | |||||
page {} | |||||
.list { | .list { | ||||
padding-top: 10rpx; | |||||
padding: 40rpx; | |||||
} | } | ||||
.list .item { | .list .item { | ||||
position: relative; | position: relative; | ||||
background-color: #fff; | background-color: #fff; | ||||
margin-bottom: 40rpx; | |||||
margin-bottom: 15rpx; | |||||
border-radius: 20rpx; | border-radius: 20rpx; | ||||
padding: 20rpx; | |||||
padding: 20rpx 0 15rpx 0; | |||||
} | } | ||||
.list .item .child { | .list .item .child { | ||||
margin-bottom: 20rpx; | |||||
font-size: 28rpx; | |||||
margin: 0 0 20rpx 20rpx; | |||||
} | |||||
.list .item .payInfo { | |||||
display: flex; | |||||
padding: 0 0 20rpx 40rpx; | |||||
border-bottom: 1px solid #d1d1d1; | |||||
} | |||||
.list .item .payInfo .parking { | |||||
width: 110rpx; | |||||
height: 110rpx; | |||||
} | |||||
.list .item .payInfo .time { | |||||
position: relative; | |||||
color: #979797; | |||||
font-size: 25rpx; | |||||
top: 10rpx; | |||||
left: 30rpx; | |||||
} | |||||
.list .item .payFee { | |||||
margin: 20rpx 0 0 20rpx; | |||||
} | |||||
.list .item .payFee .highLight { | |||||
color: #fe725c; | |||||
} | } | ||||
.list .item .detail { | .list .item .detail { | ||||
position: absolute; | position: absolute; | ||||
right: 40rpx; | right: 40rpx; | ||||
top: 50%; | top: 50%; | ||||
width: 100rpx; | |||||
height: 40rpx; | |||||
color: #fff; | |||||
line-height: 40rpx; | |||||
font-size: 25rpx; | |||||
transform: translateY(-50%); | transform: translateY(-50%); | ||||
border-radius: 10rpx; | |||||
background-image: linear-gradient(to right, #4facfe 0%, #00f2fe 100%); | |||||
padding: 5rpx 10rpx 5rpx 10rpx; | |||||
} | } | ||||
.list .item .notice { | .list .item .notice { | ||||
position: absolute; | position: absolute; | ||||
right: 40rpx; | right: 40rpx; | ||||
top: 25rpx; | |||||
top: 30rpx; | |||||
transform: translateY(-50%); | transform: translateY(-50%); | ||||
color: #ff0000; | color: #ff0000; | ||||
} | } |