diff --git a/src/entities/additional-service/model/key-in/types.ts b/src/entities/additional-service/model/key-in/types.ts
index 1b1e144..63fc60d 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;
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 = ({
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 6ddb2f6..adf1584 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')]}
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] {