Hooke / meihua-island-book

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
50e335cd 1 parent 24bba7ac

fix 细节完善

Inline Side-by-side
Showing 5 changed files with 37 additions and 23 deletions
......@@ -14,7 +14,6 @@ declare module '@vue/runtime-core' {
NavBar: typeof import('./src/components/navBar.vue')['default']
NutActionSheet: typeof import('@nutui/nutui-taro')['ActionSheet']
NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']
NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']
NutButton: typeof import('@nutui/nutui-taro')['Button']
NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']
NutCol: typeof import('@nutui/nutui-taro')['Col']
......
......@@ -180,8 +180,9 @@ const payOrder = (id) => {
<style lang="less">
.order-card-component {
margin: 0 1rem;
// padding: 0.5rem;
margin: 1rem;
margin-top: 0.5rem;
// padding: 0.5rem 0;
background-color: white;
box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);
border: 1px solid #f9f9f9;
......
.calendar-select-page {
margin: 1rem;
background-color: #F6ECE1;
background-color: #f6ece1;
border-radius: 0.5rem;
padding: 1rem 0;
padding-left: 0.5rem;
......@@ -9,12 +9,26 @@
.confirm-form {
padding-right: 1rem;
.form-text {
position: relative; width: 100%; padding: 20rpx 30rpx; display: -webkit-flex; display: -ms-flexbox; display: flex; line-height: 40rpx; -webkit-box-sizing: border-box; box-sizing: border-box; font-size: 27rpx;
position: relative;
width: 100%;
padding: 20rpx 30rpx;
padding-right: 0;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
line-height: 40rpx;
-webkit-box-sizing: border-box;
box-sizing: border-box;
font-size: 27rpx;
}
.nut-input {
padding: 20rpx;
}
.nut-input-text {
border-radius: 10rpx;
}
.nut-textarea {
border-radius: 10rpx;
padding: 20rpx;
}
}
......
<!--
* @Date: 2022-09-19 14:11:06
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2023-12-19 15:34:49
* @LastEditTime: 2023-12-19 16:55:06
* @FilePath: /meihuaApp/src/pages/confirm/index.vue
* @Description: 文件描述
-->
......@@ -51,7 +51,7 @@
<view style="color: #060606; font-size: 0.85rem;">入住时间</view>
</nut-col>
<nut-col span="12">
<view style="color: #6A4925; font-size: 0.85rem; font-weight: bold; text-align: right;">12月7日 14:00后</view>
<view style="color: #010101; font-size: 0.85rem; font-weight: bold; text-align: right;">12月7日 14:00后</view>
</nut-col>
</nut-row>
<nut-row>
......@@ -59,7 +59,7 @@
<view style="color: #060606; font-size: 0.85rem; margin: 0.25rem 0;">退房日期</view>
</nut-col>
<nut-col span="12">
<view style="color: #6A4925; font-size: 0.85rem; font-weight: bold; text-align: right; margin: 0.25rem 0;">12月8日 12:00前</view>
<view style="color: #010101; font-size: 0.85rem; font-weight: bold; text-align: right; margin: 0.25rem 0;">12月8日 12:00前</view>
</nut-col>
</nut-row>
<nut-row>
......@@ -67,7 +67,7 @@
<view style="color: #060606; font-size: 0.85rem;">早餐</view>
</nut-col>
<nut-col span="12">
<view style="color: #6A4925; font-size: 0.85rem; font-weight: bold; text-align: right;">3份</view>
<view style="color: #010101; font-size: 0.85rem; font-weight: bold; text-align: right;">3份</view>
</nut-col>
</nut-row>
<view style="font-size: 0.85rem; margin-top: 0.25rem;">
......@@ -79,42 +79,42 @@
<nut-radio-group v-model="radioVal" direction="horizontal">
<nut-radio label="1">
本人入住
<template #icon><IconFont name="checked"></IconFont></template>
<template #icon><IconFont name="checked" color="gray"></IconFont></template>
<template #checkedIcon><IconFont name="checked" color="red"></IconFont></template>
</nut-radio>
<nut-radio label="2">
帮别人订
<template #icon><IconFont name="checked"></IconFont></template>
<template #icon><IconFont name="checked" color="gray"></IconFont></template>
<template #checkedIcon><IconFont name="checked" color="red"></IconFont></template>
</nut-radio>
</nut-radio-group>
</view>
<view class="confirm-form">
<nut-row>
<nut-col :span="8">
<nut-col :span="6">
<view class="form-text"><view style="color: red; margin-right: 0.1rem;display: inline-block;">*</view>联系人</view>
</nut-col>
<nut-col :span="16">
<nut-col :span="18">
<view style="border: 1px solid #DEDEDE; border-radius: 10rpx;">
<nut-input v-model="basicData.name" class="nut-input-text" placeholder="请输入联系人" type="text" :border="false" />
</view>
</nut-col>
</nut-row>
<nut-row style="margin: 30rpx 0;">
<nut-col :span="8">
<nut-col :span="6">
<view class="form-text"><view style="color: red; margin-right: 0.1rem;display: inline-block;">*</view>联系电话</view>
</nut-col>
<nut-col :span="16">
<view style="border: 1px solid #DEDEDE; border-radius: 10rpx;" @tap="showKeyBoard">
<nut-input v-model="basicData.tel" class="nut-input-text" placeholder="请输入联系电话" type="text" :border="false" readonly />
<nut-col :span="18">
<view style="border: 1px solid #DEDEDE; border-radius: 10rpx;">
<nut-input v-model="basicData.tel" class="nut-input-text" placeholder="请输入联系电话" type="number" :border="false" />
</view>
</nut-col>
</nut-row>
<nut-row>
<nut-col :span="8">
<view class="form-text">备注</view>
<nut-col :span="6">
<view class="form-text" style="padding-left: 45rpx;">备注</view>
</nut-col>
<nut-col :span="16">
<nut-col :span="18">
<view style="border: 1px solid #DEDEDE; border-radius: 10rpx;">
<nut-textarea v-model="basicData.note" class="nut-input-text" placeholder="如有其他需求，请在此填写" :autosize="{ maxHeight: 100, minHeight: 50 }" />
</view>
......
<!--
* @Date: 2023-12-13 11:13:13
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2023-12-19 11:22:24
* @LastEditTime: 2023-12-19 16:57:41
* @FilePath: /meihuaApp/src/pages/my/index.vue
* @Description: 文件描述
-->
......@@ -26,9 +26,9 @@
<nut-tab-pane v-for="item in tabList" :title="item.title" :pane-key="item.key">
<view v-if="showContent" class="book-list">
<scroll-view ref="refScrollView" :style="scrollStyle" :scroll-y="true" :scroll-with-animation="true" @scrolltolower="onScrollToLower">
<view v-for="(item, index) in 10" :key="index">
<view v-for="(item, index) in 5" :key="index">
<order-card :key="index" @onPay="onPay"></order-card>
<view v-if="index === 9" style="height: 2rem;"></view>
<view v-if="index === 4" style="height: 2rem;"></view>
</view>
</scroll-view>
</view>
......