diff --git a/src/components/account/register/AccountRegisterTerm.js b/src/components/account/register/AccountRegisterTerm.js index fba8932..731865d 100644 --- a/src/components/account/register/AccountRegisterTerm.js +++ b/src/components/account/register/AccountRegisterTerm.js @@ -33,7 +33,11 @@ export const AccountRegisterTerm = ({ stepper, type, movePage }) => { useEffect(() => { dispatch( - Actions.termsList.request({ langDivCd: 'KOR', siteCd: 'SANDBOX' }) + Actions.termsList.request({ + langDivCd: 'KOR', + siteCd: 'SANDBOX', + termsCtgryCd: 'SITE_JOIN' + }) ); }, []); diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index ebdff55..e6d8a31 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -23,6 +23,7 @@ export default function LaancPlanContainer({ const { areaCoordList } = useSelector(state => state.flightState); const { user } = useSelector(state => state.authState); + const { laancApply } = useSelector(state => state.laancState); const [step, setStep] = useState(1); const [detailData, setDetailData] = useState(initFlightBas.initDetail); @@ -35,12 +36,6 @@ export default function LaancPlanContainer({ desc: '' }); - useEffect(() => { - if (Object.getOwnPropertyNames(finalDetailData).length != 0) { - dispatch(LaancAction.LAANC_FLIGHT_Approval.request(finalDetailData)); - setStep(2); - } - }, [finalDetailData]); useEffect(() => { setDetailData({ ...detailData, @@ -52,6 +47,18 @@ export default function LaancPlanContainer({ }; }, []); + //비행 방식 직접 입력칸 작성 시 api 호출 부분 + useEffect(() => { + if (Object.getOwnPropertyNames(finalDetailData).length != 0) { + dispatch(LaancAction.LAANC_FLIGHT_Approval.request(finalDetailData)); + } + }, [finalDetailData]); + + // laanc 승인 api 200 시 step 이동 + useEffect(() => { + if (laancApply) setStep(2); + }, [laancApply]); + // step 핸들러 const handlerStep = step => { setStep(step); @@ -340,7 +347,7 @@ export default function LaancPlanContainer({ return false; } else { - //api 호출 부분 + // 비행 방식 직접 입력칸 활성화 후 작성 시 조건문 if (detailData.areaList[0].selffltMethod) { // const concatData = {}; // concatData ={ @@ -358,7 +365,6 @@ export default function LaancPlanContainer({ }); } else { dispatch(LaancAction.LAANC_FLIGHT_Approval.request(detailData)); - setStep(2); } } }; diff --git a/src/modules/account/register/sagas/accountSaga.ts b/src/modules/account/register/sagas/accountSaga.ts index 1f55940..28cd6d0 100644 --- a/src/modules/account/register/sagas/accountSaga.ts +++ b/src/modules/account/register/sagas/accountSaga.ts @@ -32,9 +32,13 @@ function* register(action: ActionType) { function* temrsList(action: ActionType) { try { - const { langDivCd, siteCd } = action.payload; + const { langDivCd, siteCd, termsCtgryCd } = action.payload; - const res = yield call(Apis.accountApi.temrsList, { langDivCd, siteCd }); + const res = yield call(Apis.accountApi.temrsList, { + langDivCd, + siteCd, + termsCtgryCd + }); const resData: Models.AccountTermsData[] = res.data; diff --git a/src/modules/models/ComnModel.ts b/src/modules/models/ComnModel.ts index 4507f1d..6054a45 100644 --- a/src/modules/models/ComnModel.ts +++ b/src/modules/models/ComnModel.ts @@ -8,6 +8,7 @@ export interface SearchModel { export interface DefaultSeachModel { siteCd: string; langDivCd: string; + termsCtgryCd: string; } export interface ResponseModel {