From 99be1d46f725f219001e1be5d7c3561bc63fc24e Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Mon, 3 Nov 2025 14:23:15 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=8B=AC=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/ui/assets/css/calendar.css | 42 +++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/src/shared/ui/assets/css/calendar.css b/src/shared/ui/assets/css/calendar.css index ee49532..8a0a58c 100644 --- a/src/shared/ui/assets/css/calendar.css +++ b/src/shared/ui/assets/css/calendar.css @@ -55,9 +55,16 @@ } .calendar-style .react-calendar__tile--active { - background-color: #3E6AFC !important; - color: white !important; - border-radius: 100px; + background-color: white !important; +} +.calendar-style .react-calendar__tile--active abbr{ + width: 30px; + height: 30px; + display: inline-block; + line-height: 30px; + border-radius: 30px; + background: #3E6AFC !important; + color: white; } .react-calendar__tile.react-calendar__tile--hasActive.react-calendar__year-view__months__month abbr { @@ -72,12 +79,35 @@ } .react-calendar__tile--hasActive { + background: white !important; +} +.react-calendar__tile--hasActive abbr{ background: #3E6AFC !important; color: white !important; + width: 50px; + height: 50px; + display: inline-block; + line-height: 50px; + border-radius: 50px; } - -.react-calendar__tile { - /* color: #2D3436 !important; */ +.react-calendar__tile--now { + background: white !important; +} +.react-calendar__tile--now abbr { + background: #00B894 !important; + color: white !important; + width: 50px; + height: 50px; + display: inline-block; + line-height: 50px; + border-radius: 50px; +} +.react-calendar__month-view__days__day.react-calendar__tile--now abbr { + width: 30px; + height: 30px; + display: inline-block; + line-height: 30px; + border-radius: 30px; } abbr[title] { From 7610fb9e94ac63a917a8b42a331961d66b0b207d Mon Sep 17 00:00:00 2001 From: HyeonJongKim Date: Mon, 3 Nov 2025 14:24:13 +0900 Subject: [PATCH 2/4] =?UTF-8?q?-=20KeyIn=20=EA=B2=B0=EC=A0=9C=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=EC=97=90=EB=9F=AC=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/ko.json | 4 ++-- .../key-in-payment/requeset-page.tsx | 11 ++++++++--- src/pages/additional-service/list-page.tsx | 7 ++++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/locales/ko.json b/src/locales/ko.json index 8c8ca69..0e853e4 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -811,7 +811,7 @@ "activeServices": "사용중인 서비스", "availableServices": "신청 가능한 서비스", "notActiveServiceMessage": "이용 중이지 않은 서비스입니다.", - "contactSalesMessage": "가입 문의는 영업 담당자 또는 고객센터로 문의해 주세요.", + "contactSalesMessage": "가입 문의는 영업 담당자 또는 고객센터로\n문의해 주세요.", "common": { "success": "성공", "fail": "실패", @@ -1002,7 +1002,7 @@ "detailInfo": "상세 정보", "disbursementStatus": "지급 상태", "transactionType": "거래 유형", - "disbursementDateTime": "지급 날짜 시간", + "disbursementDateTime": "지급일시", "businessNumber": "사업자 번호", "accountHolder": "계좌주", "bank": "은행", diff --git a/src/pages/additional-service/key-in-payment/requeset-page.tsx b/src/pages/additional-service/key-in-payment/requeset-page.tsx index 0518e73..5bdf1ad 100644 --- a/src/pages/additional-service/key-in-payment/requeset-page.tsx +++ b/src/pages/additional-service/key-in-payment/requeset-page.tsx @@ -81,20 +81,25 @@ export const KeyInPaymentRequestPage = () => { }; keyInApply(keyInApplyParams).then((rs) => { - if (rs.data?.success) { + if (rs.status && rs.data?.success) { // 성공: 화면 유지 & 입력 내용 초기화 snackBar("KEY-IN 결제 신청을 성공하였습니다.") resetForm(); } else { // 실패: 화면 유지 & 입력 내용 유지 - const errorMessage = rs.data?.resultMessage || rs.error?.resultMessage || '결제 신청에 실패했습니다.'; + const errorMessage = rs.data?.resultMessage || + rs.error?.message || + '결제 신청에 실패했습니다.'; // HTML 태그 제거 const cleanMessage = errorMessage.replace(//gi, ' ').trim(); snackBar(`[실패] ${cleanMessage}`); } }).catch((error) => { console.error('결제 실패:', error); - const errorMessage = error?.response?.data?.error?.resultMessage || error?.message || '결제 요청 중 오류가 발생했습니다'; + const errorMessage = error?.response?.data?.data?.resultMessage || + error?.response?.data?.error?.message || + error?.message || + '결제 요청 중 오류가 발생했습니다'; snackBar(`[실패] ${errorMessage}`); }); }; diff --git a/src/pages/additional-service/list-page.tsx b/src/pages/additional-service/list-page.tsx index 638dcf5..d930e3e 100644 --- a/src/pages/additional-service/list-page.tsx +++ b/src/pages/additional-service/list-page.tsx @@ -147,7 +147,12 @@ export const ListPage = () => { message={ <> {t('additionalService.notActiveServiceMessage')}
- {t('additionalService.contactSalesMessage')} + {t('additionalService.contactSalesMessage').split('\n').map((line, index) => ( + + {line} + {index < t('additionalService.contactSalesMessage').split('\n').length - 1 &&
} + + ))} } buttonLabel={[t('common.confirm')]} From 7b1814d333990f58a3ccb1503199b115bae5795b Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Mon, 3 Nov 2025 14:25:40 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/common/ui/full-menu-close.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entities/common/ui/full-menu-close.tsx b/src/entities/common/ui/full-menu-close.tsx index cd14eb0..c8f7c9d 100644 --- a/src/entities/common/ui/full-menu-close.tsx +++ b/src/entities/common/ui/full-menu-close.tsx @@ -17,7 +17,7 @@ export const FullMenuClose = ({ From f191288edcfd989b4b628557ed666cfd3914b6f6 Mon Sep 17 00:00:00 2001 From: HyeonJongKim Date: Mon, 3 Nov 2025 14:30:14 +0900 Subject: [PATCH 4/4] =?UTF-8?q?-=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/additional-service/model/key-in/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entities/additional-service/model/key-in/types.ts b/src/entities/additional-service/model/key-in/types.ts index 5f934e8..abb2be4 100644 --- a/src/entities/additional-service/model/key-in/types.ts +++ b/src/entities/additional-service/model/key-in/types.ts @@ -125,7 +125,7 @@ export interface ExtensionKeyinApplyResponse { root?: string; errKey?: string; code?: string; - resultMessage?: string; + message?: string; timestamp?: string; details?: { path?: string;