From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/shinei.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/h5/pages/staff/vehicle/shinei.vue b/h5/pages/staff/vehicle/shinei.vue
index 35d1c20..0c4d8da 100644
--- a/h5/pages/staff/vehicle/shinei.vue
+++ b/h5/pages/staff/vehicle/shinei.vue
@@ -262,7 +262,7 @@
// if (dayjs().format('YYYY-MM-DD') == param.queryDate) {
// let endTime = new Date(i.endTime).getTime()
// let nowTime = new Date().getTime()
- i.pastFlag = new Date().getTime() > new Date(i.startTime).getTime()
+ i.pastFlag = new Date().getTime() > new Date(i.endTime).getTime()
// if (endTime < nowTime) {
// i.isUse = 1
// }
@@ -289,8 +289,8 @@
.app_header {
display: flex;
align-items: center;
- margin: 0 -15rpx;
-
+ margin: 0 -15rpx;
+ padding-top: 10rpx;
.item {
width: 330rpx;
height: 72rpx;
@@ -306,11 +306,11 @@
}
.main_footer {
- position: absolute;
+ position: fixed;
width: 100%;
left: 0;
bottom: 0;
- padding: 20rpx 30rpx 84rpx;
+ padding: 20rpx 30rpx 52rpx;
box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
.sel_time {
--
Gitblit v1.9.3