1

pages/guidecar/components/time/index.vue

 <template>
 	<view class="content">
-		<scroll-view :scroll-y="true" style="height: 100%;">
+		<scroll-view :scroll-y="true" style="height: 100%;flex: 1;box-sizing: border-box;">
 			<view class="header">
 				
 				<view style="font-size: 32rpx;color:#111;text-align: center;padding:30rpx 0;">
@@ -41,13 +41,15 @@
 					</view>
 				</view>
 			</view>
-			<view class="submit">
+			
+		</view>
+		</scroll-view>
+		<view class="submit" v-if="!immediately">
 			<button class="sub-btn" :disabled="!isSub" @click="submit">
 				<text v-if="isSub">确定</text>
-				<text v-if="!isSub">请选择往返日期</text>
+				<text v-if="!isSub">选择出行时间</text>
 			</button>
 		</view>
-		</scroll-view>
 	</view>
 </template>
 
@@ -56,6 +58,13 @@
 	import json from '../../../hotel/components/time/day.js';
 
 	export default {
+		props: {
+			
+			immediately:{
+				type:Boolean,
+				default:false
+			}
+		},
 		computed: {
 			//房间是否能预订
 			isSub() {

pages/guidecar/index.vue

@@ -191,7 +191,7 @@
 		<u-picker v-model="showStart" mode="time" :params="params" @confirm='btnStart' :default-time='defaultTime'></u-picker>
 		<!-- 定制包车的往返时间选择 -->
 		<u-popup v-model="showTimePopup" mode="bottom" border-radius="20" length="85%" :safe-area-inset-bottom="true">
-			<canlendar @finish="chosenDateResult"></canlendar>
+			<canlendar @finish="chosenDateResult" :immediately='true'></canlendar>
 		</u-popup>
 	</div>
 </template>

pages/hotel/components/time/index.vue

 <template>
 	<view class="content">
-		<scroll-view :scroll-y="true" style="height: 100%;">
+		<scroll-view :scroll-y="true" style="height: 100%;flex: 1;box-sizing: border-box;">
 			<view class="header">
 				<!-- <view class="bar"></view>
 				<view class="set text-gray">