From 72638e9f5adcc4ef7fc78b72d9fca1ff04f64725 Mon Sep 17 00:00:00 2001 From: geun <1416geun@naver.com> Date: Fri, 17 Nov 2023 14:36:52 +0900 Subject: [PATCH] reservation footer --- src/assets/css/custom.css | 8 +++-- .../control/setting/ControlReservation.js | 29 +++++++++++++++++-- .../control/setting/steps/ReserveStep1.js | 6 ++-- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index 52818be..17d49b9 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -964,5 +964,9 @@ background-size: 75% auto; .fare-wrap .list-txt > li:before {content:'';display: inline-block;width:4px;height:4px;background:rgba(255, 255, 255, 0.1);border-radius:50%;position: absolute;top: 7px;left:4px;} .fare-wrap .fare.active .list-txt > li:before{background:rgba(255, 255, 255, 0.8)} -.text1{position:fixed;bottom:0;width:calc(100% - 260px);left:260px} -.test{background:red;position:absolute;width:100%;bottom:0;} \ No newline at end of file +.uam-reservation-total{position:fixed;bottom:0;width:calc(100% - 260px);left:260px;} +.test{background:red;position:absolute;width:100%;bottom:0;} +.uam-reservation-total .collapsing{position:absolute;bottom:60px;background:yellow} +.uam-reservation-total .collapse.show{position:absolute;bottom:60px;background:yellow} + +.content.app-content{padding-bottom:5rem!important}/* 임시 css 추후삭제 */ \ No newline at end of file diff --git a/src/views/control/setting/ControlReservation.js b/src/views/control/setting/ControlReservation.js index 0aa1a14..e10053d 100644 --- a/src/views/control/setting/ControlReservation.js +++ b/src/views/control/setting/ControlReservation.js @@ -23,6 +23,7 @@ import { } from './steps'; import { CustomMainLayout } from '../../../components/layout/CustomMainLayout'; import { ChevronRight } from 'react-feather'; +import AppCollapse from '@components/app-collapse'; export default function ControlReservation({ modal, handler }) { const [activeTab, setActiveTab] = useState(1); @@ -32,6 +33,27 @@ export default function ControlReservation({ modal, handler }) { const [search, setSearch] = useState(false); const [reserveStep, setReserveStep] = useState(1); const titleName = '도심항공교통(UAM) 예약'; + const data = [ + { + title: ( +
+
+ 여정1 선택완료 + 여정2 선택완료 +
+
+ ), + content: ( +
+ Brownie sweet carrot cake dragée caramels fruitcake. Gummi bears + tootsie roll croissant gingerbread dragée tootsie roll. Cookie + caramels tootsie roll pie. Sesame snaps cookie cake donut wafer. Wafer + cookie jelly-o candy muffin cake. Marzipan topping lollipop. Gummies + chocolate sugar plum. +
+ ) + } + ]; function getStepColorClass(stepNumber, currentStep) { return stepNumber === currentStep ? 'active-step' : 'inactive-step'; @@ -231,8 +253,11 @@ export default function ControlReservation({ modal, handler }) { )} -
-
예약확인푸터
+ {/* 하단 total 생성 될때 최상단 content-wrapper에 + padding-bottom:5rem이 추가되어야함 그래야 취소 다음 버튼이 보임 + 현재 임시로 css에서 강제로 important 준 상태*/} +
+
diff --git a/src/views/control/setting/steps/ReserveStep1.js b/src/views/control/setting/steps/ReserveStep1.js index 95038fc..e47c987 100644 --- a/src/views/control/setting/steps/ReserveStep1.js +++ b/src/views/control/setting/steps/ReserveStep1.js @@ -273,7 +273,7 @@ export default function ReserveStep1() { - +