From f44d379bbd9bf900cfa8f5a424520fdf412bc352 Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Tue, 21 Feb 2023 10:23:03 +0800
Subject: [PATCH] upload
---
pages/passCar/showDetail/showDetail.js | 8 +--
pages/passCar/showDetail/showDetail.wxml | 74 ++++++++++++------------
pages/passCar/showDetail/showDetail.wxss | 18 ++++++
pages/passCar/showList/showList.js | 47 +++------------
pages/passCar/showList/showList.json | 3 +-
pages/passCar/showList/showList.wxml | 7 ++-
pages/passCar/showList/showList.wxss | 7 ++-
7 files changed, 81 insertions(+), 83 deletions(-)
diff --git a/pages/passCar/showDetail/showDetail.js b/pages/passCar/showDetail/showDetail.js
index 4e52a2f..67c1b63 100644
--- a/pages/passCar/showDetail/showDetail.js
+++ b/pages/passCar/showDetail/showDetail.js
@@ -19,9 +19,10 @@ Page({
*/
onLoad(options) {
const detail = JSON.parse(options.item)
- 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')
+ console.log(detail, 'detail');
+ // 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
})
@@ -106,7 +107,6 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
-
},
/**
diff --git a/pages/passCar/showDetail/showDetail.wxml b/pages/passCar/showDetail/showDetail.wxml
index 10eb1e5..663d978 100644
--- a/pages/passCar/showDetail/showDetail.wxml
+++ b/pages/passCar/showDetail/showDetail.wxml
@@ -1,40 +1,42 @@
-
-
- 车牌号:{{detail.carNumber}}
-
-
- 支付金额:{{detail.payAmount}}
-
-
- 支付时间:{{detail.payTime}}
-
-
- 创建时间:{{detail.createTime}}
-
-
- 更新时间:{{detail.updateTime}}
-
-
- 微信生成的订单号:{{detail.transactionId}}
-
-
- 车场订单号:{{detail.parkOrderNo}}
-
-
- 商户收款账户:{{detail.merchantAccount}}(尾号)
-
-
- 商户名称:{{detail.merchantName}}
-
-
- 是否已通知车场:{{detail.parkNotify == 1 ? '是' : '否'}}
-
-
- 通知失败原因:{{detail.notifyFailReason}}
-
-
- 通知重试次数:{{detail.notifyCount}}
+
+
+
+ 车牌号: {{detail.carNumber}}
+
+
+ 支付金额:{{detail.payAmount}}
+
+
+ 支付时间:{{detail.payTime}}
+
+
+ 创建时间:{{detail.createTime}}
+
+
+ 更新时间:{{detail.updateTime}}
+
+
+ 微信生成的订单号:{{detail.transactionId}}
+
+
+ 车场订单号:{{detail.parkOrderNo}}
+
+
+ 商户收款账户:{{detail.merchantAccount}}(尾号)
+
+
+ 商户名称:{{detail.merchantName}}
+
+
+ 是否已通知车场:{{detail.parkNotify == 1 ? '是' : '否'}}
+
+
+ 通知失败原因:{{detail.notifyFailReason}}
+
+
+ 通知重试次数:{{detail.notifyCount}}
+
\ No newline at end of file
diff --git a/pages/passCar/showDetail/showDetail.wxss b/pages/passCar/showDetail/showDetail.wxss
index 7de8a66..e5437c9 100644
--- a/pages/passCar/showDetail/showDetail.wxss
+++ b/pages/passCar/showDetail/showDetail.wxss
@@ -1,8 +1,26 @@
/* pages/passCar/showDetail/showDetail.wxss */
+page {
+ background-color: #f4f5f9;
+ font-size: 28rpx;
+}
+
.detail {
padding: 40rpx;
+ background-color: #fff;
+ border-radius: 20rpx;
+ font-weight: 600;
+}
+
+.detail .flex {
+ display: flex;
+ justify-content: space-between;
}
.detail view {
margin-bottom: 50rpx;
+ color: #a5a5a5;
+}
+
+.detail .black {
+ color: #000;
}
\ No newline at end of file
diff --git a/pages/passCar/showList/showList.js b/pages/passCar/showList/showList.js
index ac3959c..72cb4b2 100644
--- a/pages/passCar/showList/showList.js
+++ b/pages/passCar/showList/showList.js
@@ -1,4 +1,4 @@
-const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
+const navigationBarHeight = (getApp().statusBarHeight + 40) + 'px'
let config = require("../../../config/config.js");
let Http = require("../../../utils/HttpBasics");
const util = require("../../../utils/util");
@@ -11,40 +11,7 @@ Page({
*/
data: {
navigationBarHeight,
- 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
- },
- ],
+ carPayOrderList: [],
pageNum: '1'
},
@@ -55,8 +22,9 @@ Page({
}).then(res => {
console.log(res, 'res');
res.data.list.forEach(item => {
- item.payTime = this.timestampToTime(item.payTime)
- item.createTime = this.timestampToTime(item.createTime)
+ item.payTime = this.timestampToTime(item.payTime, 'YYYY-MM-DD hh:mm:ss')
+ item.createTime = this.timestampToTime(item.createTime, 'YYYY-MM-DD hh:mm:ss')
+ item.updateTime = this.timestampToTime(item.updateTime, 'YYYY-MM-DD hh:mm:ss')
})
if (pageNum == 1) {
const tempArr = res.data.list
@@ -144,7 +112,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- // this.getList(this.data.pageNum)
+ this.getList(this.data.pageNum)
},
/**
@@ -179,7 +147,8 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
-
+ this.getList(this.data.pageNum);
+ wx.stopPullDownRefresh();
},
/**
diff --git a/pages/passCar/showList/showList.json b/pages/passCar/showList/showList.json
index d9485be..5a4cc07 100644
--- a/pages/passCar/showList/showList.json
+++ b/pages/passCar/showList/showList.json
@@ -5,5 +5,6 @@
"navbar": "../../../components/navbar/navbar"
},
"navigationBarTitleText": "支付订单",
- "navigationBarBackgroundColor": "#F4F5F9"
+ "navigationBarBackgroundColor": "#F4F5F9",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/passCar/showList/showList.wxml b/pages/passCar/showList/showList.wxml
index de5f824..17f0f0c 100644
--- a/pages/passCar/showList/showList.wxml
+++ b/pages/passCar/showList/showList.wxml
@@ -1,6 +1,6 @@
-
+
车牌号:{{item.carNumber}}
@@ -10,7 +10,6 @@
创建时间:{{item.createTime}}
支付时间:{{item.payTime}}
-
支付金额:{{item.payAmount}}
@@ -22,4 +21,8 @@
+
+
+
+ 暂无支付订单
\ No newline at end of file
diff --git a/pages/passCar/showList/showList.wxss b/pages/passCar/showList/showList.wxss
index 3ff6c5b..f2e23cf 100644
--- a/pages/passCar/showList/showList.wxss
+++ b/pages/passCar/showList/showList.wxss
@@ -3,7 +3,12 @@ page {}
.list {
padding-top: 10rpx;
+}
+.noOrder {
+ text-align: center;
+ font-weight: 600;
+ margin-top: 50%;
}
.list .item {
@@ -22,7 +27,7 @@ page {}
.list .item .payInfo {
display: flex;
padding: 0 0 20rpx 40rpx;
- border-bottom: 1px solid #d1d1d1;
+ border-bottom: 1px solid #f1f1f1;
}
.list .item .payInfo .parking {