hookehuyr

fix

<!--
* @Date: 2023-12-14 10:04:23
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2023-12-21 11:34:17
* @LastEditTime: 2023-12-21 12:21:07
* @FilePath: /meihuaApp/src/components/calendarSelect.vue
* @Description: 文件描述
-->
......@@ -10,7 +10,7 @@
<nut-row gutter="10">
<nut-col span="9">
<view style="color: #7D7C7C; font-size: 0.8rem;">入住日期</view>
<view style="color: #6A4925; font-size: 0.85rem; font-weight: bold;">{{ state.checkinDate}} {{ getDayOfWeek(state.checkinDate) }}</view>
<view style="color: #6A4925; font-size: 0.85rem; font-weight: bold; margin-top: 0.1rem;">{{ state.checkinDate}} {{ getDayOfWeek(state.checkinDate) }}</view>
</nut-col>
<nut-col span="5">
<view style="color: #6A4925; margin-top: 15%; font-size: 0.8rem; text-align: center; background-color: #fff; padding: 0.25rem 0; border-radius: 0.5rem;">
......@@ -19,7 +19,7 @@
</nut-col>
<nut-col span="9">
<view style="color: #7D7C7C; font-size: 0.8rem;">退房日期</view>
<view style="color: #6A4925; font-size: 0.85rem; font-weight: bold;">{{ state.checkoutDate }} {{ getDayOfWeek(state.checkoutDate) }}</view>
<view style="color: #6A4925; font-size: 0.85rem; font-weight: bold; margin-top: 0.1rem;">{{ state.checkoutDate }} {{ getDayOfWeek(state.checkoutDate) }}</view>
</nut-col>
</nut-row>
</view>
......
......@@ -21,6 +21,7 @@
color: #6a4925;
font-size: 0.85rem;
font-weight: bold;
margin-top: 0.1rem;
}
}
.calendar-select-center {
......@@ -39,11 +40,11 @@
padding: 0 1rem 1rem;
.check-in-text {
color: #060606;
font-size: 0.85rem;
font-size: 0.87rem;
}
.check-in-time {
color: #010101;
font-size: 0.85rem;
font-size: 0.87rem;
font-weight: bold;
text-align: right;
}
......
<!--
* @Date: 2022-09-19 14:11:06
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2023-12-21 11:31:46
* @LastEditTime: 2023-12-21 12:26:13
* @FilePath: /meihuaApp/src/pages/confirm/index.vue
* @Description: 确认订单页面
-->
......@@ -29,7 +29,7 @@
</nut-row>
</view>
<view class="calendar-select-desc">
<nut-row gutter="10">
<nut-row gutter="15">
<nut-col span="9" class="calendar-select-left">
<view class="text">入住日期</view>
<view class="date">
......@@ -53,7 +53,7 @@
<view class="check-in-text">入住时间</view>
</nut-col>
<nut-col span="12">
<view class="check-in-time">{{ booking_info.check_in.month }}月{{ booking_info.check_in.day }}日 14:00后</view>
<view class="check-in-time">{{ booking_info.check_in.month }}月{{ booking_info.check_in.day }}日 14:00 后</view>
</nut-col>
</nut-row>
<nut-row>
......@@ -61,7 +61,7 @@
<view class="check-out-text">退房日期</view>
</nut-col>
<nut-col span="12">
<view class="check-out-time">{{ booking_info.check_out.month }}月{{ booking_info.check_out.day }}日 12:00前</view>
<view class="check-out-time">{{ booking_info.check_out.month }}月{{ booking_info.check_out.day }}日 12:00 前</view>
</nut-col>
</nut-row>
<nut-row>
......@@ -69,7 +69,7 @@
<view class="meal-text">早餐</view>
</nut-col>
<nut-col span="12">
<view class="meal-count">{{ booking_info.days }}份</view>
<view class="meal-count">{{ booking_info.days }} 份</view>
</nut-col>
</nut-row>
<view class="tip">
......@@ -118,8 +118,10 @@
<view class="form-text" style="padding-left: 45rpx;">备注</view>
</nut-col>
<nut-col :span="18">
<view class="form-input">
<nut-textarea v-model="formData.note" class="nut-input-text" placeholder="如有其他需求,请在此填写" :autosize="{ maxHeight: 100, minHeight: 50 }" />
<view class="form-input" style="padding: 20rpx;">
<!-- <nut-textarea v-model="formData.note" class="nut-input-text" placeholder="如有其他需求,请在此填写" :autosize="{ maxHeight: 100, minHeight: 50 }" /> -->
<!-- <nut-input v-model="formData.note" class="nut-input-text" placeholder="如有其他需求,请在此填写" type="text" :border="false" /> -->
<textarea v-model="formData.note" style="width:100%;min-height:80px;" :auto-height="true" />
</view>
</nut-col>
</nut-row>
......@@ -228,11 +230,11 @@ const goPay = () => {
});
return;
} else {
show_pay.value = true;
payData.value.id = '123';
payData.value.price = room_price_info.value.discount * book_count.value * booking_info.value.days;
payData.value.remain_time = '30:00';
console.warn(formData);
// show_pay.value = true;
// payData.value.id = '123';
// payData.value.price = room_price_info.value.discount * book_count.value * booking_info.value.days;
// payData.value.remain_time = '30:00';
}
}
......