Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web
This commit is contained in:
@@ -13,9 +13,9 @@ import { LinkPaymentHistoryPage } from './link-payment/link-payment-history-page
|
||||
import { LinkPaymentWaitSendPage } from './link-payment/link-payment-wait-send-page';
|
||||
import { KakaoPaymentNotificationListPage } from './kakao-payment-notification/list-page';
|
||||
import { KakaoPaymentNotificationSettingPage } from './kakao-payment-notification/setting-page';
|
||||
import { FundTransferRequestListPage } from './fund-transfer/request-list-page';
|
||||
import { FundTransferRequestRegisterPage } from './fund-transfer/request-register-page';
|
||||
import { FundTransferResultInquiryPage } from './fund-transfer/result-inquiry-page';
|
||||
import { FundAccountTransferListPage } from './fund-account/transfer-list-page';
|
||||
import { FundAccountTransferRequestPage } from './fund-account/transfer-request-page';
|
||||
import { FundAccountResultListPage } from './fund-account/result-list-page';
|
||||
import { SettlementAgencyManagePage } from './settlement-agency/manage-page';
|
||||
import { SettlementAgencyDepositPage } from './settlement-agency/deposit-page';
|
||||
import { SettlementAgencyMemberPage } from './settlement-agency/member-page';
|
||||
@@ -73,10 +73,10 @@ export const AdditionalServicePages = () => {
|
||||
<Route path={ROUTE_NAMES.additionalService.kakaoPaymentNotification.list} element={<KakaoPaymentNotificationListPage />} />
|
||||
<Route path={ROUTE_NAMES.additionalService.kakaoPaymentNotification.setting} element={<KakaoPaymentNotificationSettingPage />} />
|
||||
</Route>
|
||||
<Route path={ROUTE_NAMES.additionalService.fundTransfer.base}>
|
||||
<Route path={ROUTE_NAMES.additionalService.fundTransfer.requestList} element={<FundTransferRequestListPage />} />
|
||||
<Route path={ROUTE_NAMES.additionalService.fundTransfer.requestRegister} element={<FundTransferRequestRegisterPage />} />
|
||||
<Route path={ROUTE_NAMES.additionalService.fundTransfer.resultInquiry} element={<FundTransferResultInquiryPage />} />
|
||||
<Route path={ROUTE_NAMES.additionalService.fundAccount.base}>
|
||||
<Route path={ROUTE_NAMES.additionalService.fundAccount.transferList} element={<FundAccountTransferListPage />} />
|
||||
<Route path={ROUTE_NAMES.additionalService.fundAccount.transferRequest} element={<FundAccountTransferRequestPage />} />
|
||||
<Route path={ROUTE_NAMES.additionalService.fundAccount.resultList} element={<FundAccountResultListPage />} />
|
||||
</Route>
|
||||
<Route path={ROUTE_NAMES.additionalService.settlementAgency.base}>
|
||||
<Route path={ROUTE_NAMES.additionalService.settlementAgency.manage} element={<SettlementAgencyManagePage />} />
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { useState } from 'react';
|
||||
import { PATHS } from '@/shared/constants/paths';
|
||||
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
|
||||
import { FundTransferTab } from '@/entities/additional-service/ui/fund-transfer/fund-transfer-tab';
|
||||
import { FundTransferResultInquiryWrap } from '@/entities/additional-service/ui/fund-transfer/fund-transfer-result-inquiry-wrap';
|
||||
import { FundTransferTabKeys } from '@/entities/additional-service/model/types';
|
||||
import { FundAccountTab } from '@/entities/additional-service/ui/fund-account/tab';
|
||||
import { FundAccountResultListWrap } from '@/entities/additional-service/ui/fund-account/result-list-wrap';
|
||||
import { FundAccountTabKeys } from '@/entities/additional-service/model/fund-account/types';
|
||||
import { HeaderType } from '@/entities/common/model/types';
|
||||
import {
|
||||
useSetHeaderTitle,
|
||||
@@ -12,10 +12,10 @@ import {
|
||||
useSetOnBack
|
||||
} from '@/widgets/sub-layout/use-sub-layout';
|
||||
|
||||
export const FundTransferResultInquiryPage = () => {
|
||||
export const FundAccountResultListPage = () => {
|
||||
const { navigate } = useNavigate();
|
||||
|
||||
const [activeTab, setActiveTab] = useState<FundTransferTabKeys>(FundTransferTabKeys.ResultInquiry);
|
||||
const [activeTab, setActiveTab] = useState<FundAccountTabKeys>(FundAccountTabKeys.ResultList);
|
||||
|
||||
useSetHeaderTitle('자금이체');
|
||||
useSetHeaderType(HeaderType.LeftArrow);
|
||||
@@ -28,9 +28,9 @@ export const FundTransferResultInquiryPage = () => {
|
||||
<>
|
||||
<main>
|
||||
<div className="tab-content">
|
||||
<div className="tab-pane sub active">
|
||||
<FundTransferTab activeTab={ activeTab }></FundTransferTab>
|
||||
<FundTransferResultInquiryWrap></FundTransferResultInquiryWrap>
|
||||
<div className="tab-pane pt-46 active">
|
||||
<FundAccountTab activeTab={ activeTab }></FundAccountTab>
|
||||
<FundAccountResultListWrap></FundAccountResultListWrap>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
@@ -1,9 +1,9 @@
|
||||
import { useState } from 'react';
|
||||
import { PATHS } from '@/shared/constants/paths';
|
||||
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
|
||||
import { FundTransferTab } from '@/entities/additional-service/ui/fund-transfer/fund-transfer-tab';
|
||||
import { FundTransferRequestListWrap } from '@/entities/additional-service/ui/fund-transfer/fund-transfer-request-list-wrap';
|
||||
import { FundTransferTabKeys } from '@/entities/additional-service/model/types';
|
||||
import { FundAccountTab } from '@/entities/additional-service/ui/fund-account/tab';
|
||||
import { FundAccountTransferListWrap } from '@/entities/additional-service/ui/fund-account/transfer-list-wrap';
|
||||
import { FundAccountTabKeys } from '@/entities/additional-service/model/fund-account/types';
|
||||
import { HeaderType } from '@/entities/common/model/types';
|
||||
import {
|
||||
useSetHeaderTitle,
|
||||
@@ -12,10 +12,10 @@ import {
|
||||
useSetOnBack
|
||||
} from '@/widgets/sub-layout/use-sub-layout';
|
||||
|
||||
export const FundTransferRequestListPage = () => {
|
||||
export const FundAccountTransferListPage = () => {
|
||||
const { navigate } = useNavigate();
|
||||
|
||||
const [activeTab, setActiveTab] = useState<FundTransferTabKeys>(FundTransferTabKeys.RequestList);
|
||||
const [activeTab, setActiveTab] = useState<FundAccountTabKeys>(FundAccountTabKeys.TransferList);
|
||||
|
||||
useSetHeaderTitle('자금이체');
|
||||
useSetHeaderType(HeaderType.LeftArrow);
|
||||
@@ -29,8 +29,8 @@ export const FundTransferRequestListPage = () => {
|
||||
<main>
|
||||
<div className="tab-content">
|
||||
<div className="tab-pane pt-46 active">
|
||||
<FundTransferTab activeTab={ activeTab }></FundTransferTab>
|
||||
<FundTransferRequestListWrap></FundTransferRequestListWrap>
|
||||
<FundAccountTab activeTab={ activeTab }></FundAccountTab>
|
||||
<FundAccountTransferListWrap></FundAccountTransferListWrap>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
@@ -0,0 +1,6 @@
|
||||
export const FundAccountTransferRequestPage = () => {
|
||||
|
||||
return (
|
||||
<></>
|
||||
);
|
||||
};
|
||||
@@ -1,6 +0,0 @@
|
||||
export const FundTransferRequestRegisterPage = () => {
|
||||
|
||||
return (
|
||||
<></>
|
||||
);
|
||||
};
|
||||
@@ -53,7 +53,7 @@ export const IntroPage = () => {
|
||||
},
|
||||
{
|
||||
className: 'list-wrap02', serviceName: '자금이체', serviceDesc: '예치금으로 즉시 송금, 파일 등록만으로 다중 송금 가능',
|
||||
icon: IMAGE_ROOT + '/icon_ing08.svg', path: PATHS.additionalService.fundTransfer.requestList
|
||||
icon: IMAGE_ROOT + '/icon_ing08.svg', path: PATHS.additionalService.fundAccount.transferList
|
||||
},
|
||||
{
|
||||
className: 'list-wrap02', serviceName: '계좌점유인증', serviceDesc: '1원 송금으로 실제 계좌 점유 확인 여부',
|
||||
|
||||
Reference in New Issue
Block a user