From a2a2b2e6fad06f6ee188a9f7080462cd09b5c663 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Tue, 13 May 2025 17:21:22 +0900 Subject: [PATCH] fix: restore storeNm property in session management and adjust padding in check and radio components for improved layout --- src/app/api/auth/route.ts | 2 +- src/store/session.ts | 2 +- src/styles/base/_check-radio.scss | 36 +++++--- src/styles/components/_pop-contents.scss | 78 ++++++++++++++++- src/styles/components/_sub.scss | 102 ++++++++++++++--------- src/styles/layout/_layout.scss | 3 + src/styles/layout/_pop-common.scss | 1 - src/types/Auth.ts | 2 +- 8 files changed, 168 insertions(+), 58 deletions(-) diff --git a/src/app/api/auth/route.ts b/src/app/api/auth/route.ts index 612126c..32ac8f9 100644 --- a/src/app/api/auth/route.ts +++ b/src/app/api/auth/route.ts @@ -29,7 +29,7 @@ export async function POST(request: Request) { session.compCd = result.data.data.compCd session.agencyStoreId = result.data.data.agencyStoreId session.storeId = result.data.data.storeId - // session.storeNm = result.data.data.storeNm + session.storeNm = result.data.data.storeNm session.userId = result.data.data.userId session.category = result.data.data.category session.userNm = result.data.data.userNm diff --git a/src/store/session.ts b/src/store/session.ts index cd6182e..f96926a 100644 --- a/src/store/session.ts +++ b/src/store/session.ts @@ -21,7 +21,7 @@ const initialState: InitialState = { compCd: null, agencyStoreId: null, storeId: null, - // storeNm: null, + storeNm: null, userId: null, category: null, userNm: null, diff --git a/src/styles/base/_check-radio.scss b/src/styles/base/_check-radio.scss index bbecd6f..3df63fa 100644 --- a/src/styles/base/_check-radio.scss +++ b/src/styles/base/_check-radio.scss @@ -31,14 +31,14 @@ .check-form-box{ position: relative; label{ - padding-left: 30px; + padding-left: 28px; &::before{ content: ""; display: inline-block; position: absolute; - width: 22px; - height: 22px; - top: -1px; + width: 20px; + height: 20px; + top: 0px; left: 0; margin-left: 0px; border: 1px solid #A8B6C7; @@ -51,9 +51,9 @@ content: ""; display: inline-block; position: absolute; - width: 22px; - height: 22px; - top: -1px; + width: 20px; + height: 20px; + top: 0px; left: 0; margin-left: 0; border-color: #fff; @@ -69,7 +69,7 @@ display: inline-block; position: absolute; top: -1px; - left: 0%; + left: -1px; width: 7px; height: 9px; border: 2px solid #fff; @@ -89,20 +89,30 @@ input[type="checkbox"]:disabled + label::after{ cursor: default; } + &.ch-bld{ + input[type="checkbox"]:checked + label{ + font-weight: 500; + } + } + &.light{ + label{ + color: #8595A7; + } + } } // radio box .radio-form-box{ position: relative; label{ - padding-left: 30px; + padding-left: 28px; &::before{ content: ""; display: inline-block; position: absolute; - width: 22px; - height: 22px; - top: -1px; + width: 20px; + height: 20px; + top: 0px; left: 0; margin-left: 0; border: 1px solid #A8B6C7; @@ -119,7 +129,7 @@ display: inline-block; position: absolute; top: 5px; - left: 6px; + left: 5px; width: 10px; height: 10px; background-color: transparent; diff --git a/src/styles/components/_pop-contents.scss b/src/styles/components/_pop-contents.scss index 3eb796b..f0f18d5 100644 --- a/src/styles/components/_pop-contents.scss +++ b/src/styles/components/_pop-contents.scss @@ -36,8 +36,84 @@ } // 지붕재 적합성 상세 +.compliance-check-bx{ + &.act{ + .compliance-check-pop-contents{ + display: block; + } + } +} .compliance-check-pop-contents{ - padding: 14px; + display: none; + padding: 14px 14px 10px 14px; border-top: 1px solid #ECECEC; margin-top: 10px; +} +.check-pop-data-wrap{ + margin-bottom: 24px; + .check-pop-data-tit{ + position: relative; + padding-left: 10px; + margin-bottom: 8px; + @include defaultFont($font-s-13, $font-w-500, $font-c); + &::before{ + content: ''; + position: absolute; + top: 50%; + left: 0; + transform: translateY(-50%); + width: 4px; + height: 4px; + background-color: #2E3A59; + border-radius: 50%; + } + } + .check-pop-data-txt{ + padding-left: 10px; + @include defaultFont($font-s-13, $font-w-400, $font-c); + } +} + +.check-pop-data-table{ + border-top: 1px solid #2E3A59; + &:last-child{ + .pop-data-table-footer{ + border-bottom: 1px solid #2E3A59; + } + } +} +.pop-data-table-head{ + @include flex(0px); + align-items: center; + padding: 10px; + border-top: 1px solid #2E3A59; + border-bottom: 1px solid #2E3A59; + .pop-data-table-head-name{ + @include defaultFont($font-s-13, $font-w-500, $font-c); + } + .pop-data-table-head-icon{ + margin-left: auto; + min-width: 44px; + @include flex(0px); + } +} +.pop-data-table-body{ + padding: 11px 10px; + border-bottom: 1px solid #2E3A59; + @include defaultFont($font-s-13, $font-w-400, $font-c); +} +.pop-data-table-footer{ + @include flex(0px); + .pop-data-table-footer-unit{ + flex: 1; + padding: 10px; + @include defaultFont($font-s-13, $font-w-500, $font-c); + border-right: 1px solid #2E3A59; + } + .pop-data-table-footer-data{ + flex: none; + width: 104px; + padding: 10px; + @include defaultFont($font-s-13, $font-w-400, $font-c); + } } \ No newline at end of file diff --git a/src/styles/components/_sub.scss b/src/styles/components/_sub.scss index 9f52715..6e6a5fb 100644 --- a/src/styles/components/_sub.scss +++ b/src/styles/components/_sub.scss @@ -338,8 +338,34 @@ position: relative; padding-right: 70px; .inquiry-item-category{ - @include defaultFont($font-s-13, $font-w-400, $font-c); + display: flex; + align-items: center; margin-bottom: 5px; + span{ + position: relative; + display: block; + @include defaultFont($font-s-13, $font-w-400, $font-c); + padding: 0 6px; + &:first-child{ + padding-left: 0; + } + &:last-child{ + padding-right: 0; + &::before{ + display: none; + } + } + &::before{ + content: ''; + position: absolute; + top: 50%; + right: 0; + transform: translateY(-50%); + width: 1px; + height: 10px; + background-color: #A2ABB8; + } + } } .inquiry-item-tit{ @include defaultFont($font-s-15, $font-w-500, $font-c); @@ -419,8 +445,34 @@ border-bottom: 1px solid #2E3A59; margin-bottom: 24px; .inquiry-detail-category{ - @include defaultFont($font-s-13, $font-w-400, $font-c); + display: flex; + align-items: center; margin-bottom: 3px; + span{ + position: relative; + display: block; + @include defaultFont($font-s-13, $font-w-400, $font-c); + padding: 0 6px; + &:first-child{ + padding-left: 0; + } + &:last-child{ + padding-right: 0; + &::before{ + display: none; + } + } + &::before{ + content: ''; + position: absolute; + top: 50%; + right: 0; + transform: translateY(-50%); + width: 1px; + height: 10px; + background-color: #A2ABB8; + } + } } .inquiry-detail-tit{ @include defaultFont($font-s-15, $font-w-500, $font-c); @@ -434,6 +486,7 @@ // 1:1 문의 답변 .inquiry-answer-wrap{ margin-top: 24px; + } .inquiry-answer-header{ padding: 20px 0; @@ -447,6 +500,10 @@ @include defaultFont($font-s-13, $font-w-400, #F86A56); } } +.inquiry-answer-tit{ + @include defaultFont($font-s-13, $font-w-400, $font-c); + margin-bottom: 3px; +} // 비밀번호 변경 .border-frame{ @@ -553,12 +610,7 @@ } } } -.compliace-nodata{ - margin-top: 24px; - padding: 30px 0; - @include defaultFont($font-s-13, $font-w-400, $font-c); - text-align: center; -} + .compliace-nosearch{ padding: 30px 0; span{ @@ -567,44 +619,14 @@ text-align: center; } } -.check-form-box{ - &.com-tit{ - label{ - &:before{ - width: 20px; - height: 20px; - top: 0; - } - } - input[type="checkbox"]:checked + label{ - font-weight: 500; - &::after{ - left: -1px; - } - } - } - &.com-txt{ - label{ - @include defaultFont($font-s-13, $font-w-400, #8595A7); - &:before{ - width: 20px; - height: 20px; - top: 0; - } - } - input[type="checkbox"]:checked + label{ - &::after{ - left: -1px; - } - } - } -} + .check-item-wrap{ display: flex; align-items: center; } .compliance-icon-wrap{ margin-left: auto; + min-width: 44px; display: flex; align-items: center; } diff --git a/src/styles/layout/_layout.scss b/src/styles/layout/_layout.scss index 6d1e7c4..95ae2e4 100644 --- a/src/styles/layout/_layout.scss +++ b/src/styles/layout/_layout.scss @@ -161,6 +161,9 @@ header{ &.icon02{ background-image: url(/assets/images/layout/side_swiper_icon02.svg) } + &.icon03{ + background-image: url(/assets/images/layout/side_swiper_icon03.svg) + } } .side-swiper-infor{ @include defaultFont($font-s-12, $font-w-500, #7896BA); diff --git a/src/styles/layout/_pop-common.scss b/src/styles/layout/_pop-common.scss index 365d2b3..e90529a 100644 --- a/src/styles/layout/_pop-common.scss +++ b/src/styles/layout/_pop-common.scss @@ -22,7 +22,6 @@ .modal-content{ flex:1; position: relative; - margin: 0 16px; background-clip: padding-box; background-color: $white-fff; border-radius: 16px; diff --git a/src/types/Auth.ts b/src/types/Auth.ts index 8f08451..8dc21cb 100644 --- a/src/types/Auth.ts +++ b/src/types/Auth.ts @@ -7,7 +7,7 @@ export interface SessionData { compCd: null agencyStoreId: null storeId: null - // storeNm: null + storeNm: null userId: null category: null userNm: null