From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/shinei.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/h5/pages/staff/vehicle/shinei.vue b/h5/pages/staff/vehicle/shinei.vue
index 35d1c20..4704e57 100644
--- a/h5/pages/staff/vehicle/shinei.vue
+++ b/h5/pages/staff/vehicle/shinei.vue
@@ -46,7 +46,7 @@
<u-picker keyName="code" :show="isShowCar" :columns="carsList" @confirm="seletedCar"
@cancel="isShowCar = false"></u-picker>
<!-- 鏃ユ湡 -->
- <u-datetime-picker ref="startPick" :show="isShowDate" :minDate="minDate" @confirm="confirmDate"
+ <u-datetime-picker ref="startPick" :formatter="formatter" :show="isShowDate" :minDate="minDate" @confirm="confirmDate"
@cancel="isShowDate = false" mode="date"></u-datetime-picker>
<!-- 璇︽儏 -->
<u-popup :show="isShowDetail" :round="12" mode="bottom" @close="isShowDetail = false">
@@ -131,7 +131,25 @@
this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
this.initData()
},
- methods: {
+ methods: {
+ formatter(type, value) {
+ if (type === 'year') {
+ return `${value}骞碻
+ }
+ if (type === 'month') {
+ return `${value}鏈坄
+ }
+ if (type === 'day') {
+ return `${value}鏃
+ }
+ if (type === 'hour') {
+ return `${value}鏃禶
+ }
+ if (type === 'minute') {
+ return `${value}鍒哷
+ }
+ return value
+ },
onSubmit() {
const {
param
@@ -262,7 +280,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 +307,8 @@
.app_header {
display: flex;
align-items: center;
- margin: 0 -15rpx;
-
+ margin: 0 -15rpx;
+ padding-top: 10rpx;
.item {
width: 330rpx;
height: 72rpx;
@@ -306,11 +324,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