From 1657b43c3a0329252e70b4b2ee96bfedb8b589df Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Mon, 20 Feb 2023 15:57:36 +0800 Subject: [PATCH] upload --- assets/images/parking.png | Bin 0 -> 4631 bytes pages/passCar/showDetail/showDetail.js | 6 +- pages/passCar/showDetail/showDetail.wxml | 5 +- pages/passCar/showList/showList.js | 88 ++++++++++++++++++++++- pages/passCar/showList/showList.wxml | 12 +++- pages/passCar/showList/showList.wxss | 50 ++++++++++--- 6 files changed, 142 insertions(+), 19 deletions(-) create mode 100644 assets/images/parking.png diff --git a/assets/images/parking.png b/assets/images/parking.png new file mode 100644 index 0000000000000000000000000000000000000000..248380890886acddb6c393ee464a0d115eb8df45 GIT binary patch literal 4631 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 N002ovPDHLkV1h=$cohHu literal 0 HcmV?d00001 diff --git a/pages/passCar/showDetail/showDetail.js b/pages/passCar/showDetail/showDetail.js index 8888068..4e52a2f 100644 --- a/pages/passCar/showDetail/showDetail.js +++ b/pages/passCar/showDetail/showDetail.js @@ -19,9 +19,9 @@ Page({ */ onLoad(options) { 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({ detail: detail }) diff --git a/pages/passCar/showDetail/showDetail.wxml b/pages/passCar/showDetail/showDetail.wxml index 60a193a..10eb1e5 100644 --- a/pages/passCar/showDetail/showDetail.wxml +++ b/pages/passCar/showDetail/showDetail.wxml @@ -23,10 +23,7 @@ 车场订单号:{{detail.parkOrderNo}} - 商户收款账户:{{detail.merchantAccount}} - - - 商户编号:{{detail.merchantId}} + 商户收款账户:{{detail.merchantAccount}}(尾号) 商户名称:{{detail.merchantName}} diff --git a/pages/passCar/showList/showList.js b/pages/passCar/showList/showList.js index 8b6a7c4..ac3959c 100644 --- a/pages/passCar/showList/showList.js +++ b/pages/passCar/showList/showList.js @@ -11,7 +11,40 @@ Page({ */ data: { 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' }, @@ -21,6 +54,10 @@ Page({ url: config.api.carPayOrderList + `?pageNum=${pageNum}&pageSize=10`, }).then(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) { const tempArr = res.data.list 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) { - this.getList(this.data.pageNum) + // this.getList(this.data.pageNum) }, /** diff --git a/pages/passCar/showList/showList.wxml b/pages/passCar/showList/showList.wxml index c8a9a8d..de5f824 100644 --- a/pages/passCar/showList/showList.wxml +++ b/pages/passCar/showList/showList.wxml @@ -4,8 +4,16 @@ 车牌号:{{item.carNumber}} - 支付金额:{{item.payAmount}} - 支付时间:{{item.payTime}} + + + + 创建时间:{{item.createTime}} + 支付时间:{{item.payTime}} + + + + + 支付金额:{{item.payAmount}} 查看详情 diff --git a/pages/passCar/showList/showList.wxss b/pages/passCar/showList/showList.wxss index fc702cc..3ff6c5b 100644 --- a/pages/passCar/showList/showList.wxss +++ b/pages/passCar/showList/showList.wxss @@ -1,36 +1,70 @@ /* pages/passCar/showList.wxss */ -page { - background-color: #dfdfdf; -} +page {} .list { + padding-top: 10rpx; - padding: 40rpx; } .list .item { position: relative; background-color: #fff; - margin-bottom: 40rpx; + margin-bottom: 15rpx; border-radius: 20rpx; - padding: 20rpx; + padding: 20rpx 0 15rpx 0; } .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 { position: absolute; right: 40rpx; top: 50%; + width: 100rpx; + height: 40rpx; + color: #fff; + line-height: 40rpx; + font-size: 25rpx; transform: translateY(-50%); + border-radius: 10rpx; + background-image: linear-gradient(to right, #4facfe 0%, #00f2fe 100%); + padding: 5rpx 10rpx 5rpx 10rpx; } .list .item .notice { position: absolute; right: 40rpx; - top: 25rpx; + top: 30rpx; transform: translateY(-50%); color: #ff0000; } \ No newline at end of file