From 3e84978d39cf6399e2335f9a5b10ca144ee9f606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 07 十一月 2024 14:28:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/shiwai.vue | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/h5/pages/staff/vehicle/shiwai.vue b/h5/pages/staff/vehicle/shiwai.vue
index 8470ad9..6eb83c4 100644
--- a/h5/pages/staff/vehicle/shiwai.vue
+++ b/h5/pages/staff/vehicle/shiwai.vue
@@ -21,7 +21,7 @@
<text>*</text>
<text>棰勮鐢ㄨ溅鏃舵</text>
</view>
- <view class="value" @click="isShowDate = true">
+ <view class="value" @click="showDate">
<text
class="mr6"
:style="{ color: param.startTime ? '#000000' : '#999999' }"
@@ -66,11 +66,14 @@
</view>
</view>
<view class="main_footer">
- <text>宸查�夋嫨锛�</text>
- <text class="sel" v-if="param.startTime"
- >{{ param.startHours }}鑷硔{ param.endHours }}</text
- >
- <text class="btn" :class="{disable: info && info.length > 0}" @click="onSubmit">纭棰勭害</text>
+ <view class="df_sb">
+ <text>宸查�夋嫨锛�</text>
+ <text class="sel" v-if="param.startTime"
+ >{{ param.startHours }}鑷硔{ param.endHours }}</text
+ >
+ <text class="btn" :class="{disable: info && info.length > 0}" @click="onSubmit">纭棰勭害</text>
+ </view>
+ <view class="red">{{placeStr}}</view>
</view>
<!-- -->
<!-- 閫夋嫨杞﹁締 -->
@@ -97,6 +100,7 @@
<u-datetime-picker
mode="datetime"
:show="isShowDate"
+ ref="startPick"
title="寮�濮嬫椂闂�"
:minDate="minDate"
@close="isShowDate = false"
@@ -130,15 +134,22 @@
carsList: [],
info: [],
- minDate: ''
+ minDate: '',
+ placeStr: ''
}
},
onLoad() {
- this.minDate = new Date(dayjs().format('YYYY-MM-DD HH:mm') + ':00').getTime()
- console.log('minDate', this.minDate);
+ // this.minDate = new Date(dayjs().format('YYYY-MM-DD HH:mm') + ':00').getTime()
+ this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
this.initData()
},
methods: {
+ showDate() {
+ this.isShowDate = true
+ if (!this.param.startTime) {
+ this.$refs.startPick.innerValue = new Date().getTime()
+ }
+ },
onSubmit() {
const { param, info } = this
if (info.length > 0) return
@@ -198,6 +209,12 @@
if (this.param.carId && this.param.startTime) {
this.getInfo()
}
+ console.log(e);
+ if(new Date(this.param.startTime).getTime() < new Date().getTime() - 60 * 1000){
+ this.placeStr = '褰撳墠閫夋嫨鍖呭惈宸茬粡杩囧幓鏃堕棿锛岃纭鍚庡啀鎻愪氦锛�'
+ }else{
+ this.placeStr = ''
+ }
this.$forceUpdate()
},
endtimeClose() {
@@ -328,9 +345,12 @@
bottom: 0;
padding: 20rpx 30rpx 84rpx;
box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
- display: flex;
- align-items: center;
- justify-content: space-between;
+
+ .df_sb{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
.btn {
width: 184rpx;
height: 72rpx;
--
Gitblit v1.9.3