From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/staff/vehicle/apply.vue |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index 159180f..23ad5ae 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/h5/pages/staff/vehicle/apply.vue
@@ -134,14 +134,16 @@
       <view class="line"
         >4銆佸叕鍙稿�熺粰鐢宠浜虹敤杞︼紝鐢宠鍊熻溅浜轰负绗竴璐d换浜猴紝涓嶅厑璁歌浆鍊熺粰鍏朵粬浜轰娇鐢紝鑻ヨ鍊熺粰浠栦汉浣跨敤銆傝矗浠讳汉瑕佹壙鎷呭叏閮ㄨ矗浠汇��</view
       >
+			<view class="sub_btn" @click="handleSub">鎻愪氦</view>
     </view>
-    <view class="sub_btn" @click="handleSub">鎻愪氦</view>
     <!--  -->
     <!-- :minDate="new Date(param.startTime).getTime()"
       :maxDate="new Date(param.endTime).getTime()" -->
     <u-datetime-picker
       :show="isShowDatetime"
       @confirm="confirmDate"
+      :minDate="new Date(param.startTime).getTime()"
+      :maxDate="new Date(param.endTime).getTime()"
       @cancel="isShowDatetime = false"
       mode="datetime"
     ></u-datetime-picker>
@@ -170,7 +172,7 @@
     console.log(option)
     this.param = { ...option }
     this.minDate = new Date().getTime()
-
+		this.param.planUseDate = dayjs(this.param.startTime).format('YYYY-MM-DD HH:mm')
   },
   methods: {
     handleSub() {
@@ -289,9 +291,10 @@
   }
 }
 .sub_btn {
-  position: fixed;
-  bottom: 84rpx;
-  left: 30rpx;
+  // position: fixed;
+  // bottom: 84rpx;
+  // left: 30rpx;
+	margin-top: 60rpx;
   width: 690rpx;
   height: 88rpx;
   line-height: 88rpx;

--
Gitblit v1.9.3