diff --git a/src/components/ServiceManage/index.js b/src/components/ServiceManage/index.js index 813fcae..857fbf2 100644 --- a/src/components/ServiceManage/index.js +++ b/src/components/ServiceManage/index.js @@ -6,6 +6,7 @@ import BattleEventModal from './modal/BattleEventModal' import ReportListAnswerModal from './modal/ReportListAnswerModal'; import ReportListDetailModal from './modal/ReportListDetailModal'; import UserBlockDetailModal from './modal/UserBlockDetailModal'; +import OwnerChangeModal from './modal/OwnerChangeModal'; //searchbar import ReportListSearchBar from './searchBar/ReportListSearchBar'; import UserBlockSearchBar from './searchBar/UserBlockSearchBar'; @@ -35,5 +36,6 @@ export { EventListSearchBar, LandAuctionSearchBar, LandAuctionModal, - BattleEventModal + BattleEventModal, + OwnerChangeModal }; diff --git a/src/components/common/Date/SingleTimePicker.js b/src/components/common/Date/SingleTimePicker.js index d21d24e..defd2ca 100644 --- a/src/components/common/Date/SingleTimePicker.js +++ b/src/components/common/Date/SingleTimePicker.js @@ -52,7 +52,7 @@ const SingleTimePicker = ({ return ( <> - {label} + {label && {label}} { const token = sessionStorage.getItem('token'); @@ -66,10 +67,10 @@ const LandInfoView = () => { const handleModalSubmit = async (type, param = null) => { switch (type) { - // case "regist": - // setModalType('regist'); - // handleModalView('detail'); - // break; + case "regist": + setModalType('regist'); + handleModalView('detail'); + break; // case "detail": // await LandAuctionDetailView(token, param).then(data => { // setDetailData(data.auction_detail); @@ -209,8 +210,10 @@ const LandInfoView = () => { } + - {/**/} + + handleModalClose('detail')} content={detailData} setDetailData={setDetailData} /> ); }; diff --git a/src/styles/Components.js b/src/styles/Components.js index e6f937c..8ba3913 100644 --- a/src/styles/Components.js +++ b/src/styles/Components.js @@ -150,6 +150,7 @@ export const BtnWrapper = styled.div` justify-content: ${props => props.$justify}; gap: ${props => props.$gap}; margin-top: ${props => props.$marginTop}; + margin-bottom: ${props => props.$marginBottom}; padding-top: ${props => props.$paddingTop}; `; diff --git a/src/styles/ModuleComponents.js b/src/styles/ModuleComponents.js index 77a9ed8..755f1de 100644 --- a/src/styles/ModuleComponents.js +++ b/src/styles/ModuleComponents.js @@ -569,6 +569,13 @@ export const MessageBox = styled.div` // FORM +export const FormItemGroup = styled.div` + margin-bottom: 15px; + display: flex; + align-items: center; + justify-content: flex-start; +`; + export const FormGroup = styled.div` margin-bottom: 24px; `;