diff --git a/app/app.vue b/app/app.vue index 263c680..ecb9d6d 100644 --- a/app/app.vue +++ b/app/app.vue @@ -194,7 +194,6 @@ onBeforeUnmount(() => { - diff --git a/layers/assets/css/base/_transition.css b/layers/assets/css/base/_transition.css index 8cc9b36..59f1fb8 100644 --- a/layers/assets/css/base/_transition.css +++ b/layers/assets/css/base/_transition.css @@ -1,13 +1,3 @@ -/* page-fade */ -.page-fade-enter-active, -.page-fade-leave-active { - transition: opacity 0.6s cubic-bezier(0.33, 1, 0.68, 1); -} -.page-fade-enter-from, -.page-fade-leave-to { - opacity: 0; -} - /* fade */ .fade-enter-active, .fade-leave-active { @@ -18,6 +8,23 @@ opacity: 0; } +/* fade-out */ +.fade-out-enter-active, +.fade-out-enter-from, +.fade-out-enter-to { + transition: none; + opacity: 1; +} +.fade-out-leave-active { + transition: opacity 0.3s ease-out; +} +.fade-out-leave-from { + opacity: 1; +} +.fade-out-leave-to { + opacity: 0; +} + .slide-up-enter-active, .slide-up-leave-active { transition: diff --git a/layers/components/atoms/loading/Simple.vue b/layers/components/atoms/loading/Simple.vue deleted file mode 100644 index ec4eb87..0000000 --- a/layers/components/atoms/loading/Simple.vue +++ /dev/null @@ -1,47 +0,0 @@ - - - - - diff --git a/layers/components/layouts/Header.vue b/layers/components/layouts/Header.vue index c0f0caa..3b5350f 100644 --- a/layers/components/layouts/Header.vue +++ b/layers/components/layouts/Header.vue @@ -63,13 +63,11 @@ const hasActiveChild = (children?: GameDataMenuChildren) => { const isNavItemActive = (gnbItem: GameDataMenu): boolean => { const cur = currentPath.value const base = gnbItem?.url_path - if (import.meta.client) { - const selfActive = - !!base && - isInternalUrl(base) && - pathMatches(formatPathWithoutLocale(base), cur) - return selfActive || hasActiveChild(gnbItem.children) - } + const selfActive = + !!base && + isInternalUrl(base) && + pathMatches(formatPathWithoutLocale(base), cur) + return selfActive || hasActiveChild(gnbItem.children) } // navAreaRef의 넓이를 구하는 함수 diff --git a/layers/templates/FxCoupon01/index.vue b/layers/templates/FxCoupon01/index.vue index 9aef765..8ac1c1c 100644 --- a/layers/templates/FxCoupon01/index.vue +++ b/layers/templates/FxCoupon01/index.vue @@ -16,6 +16,7 @@ import type { ReqCouponList } from '#layers/types/api/couponData' // Props interface Props { + id?: string components: PageDataTemplateComponents pageVerTmplSeq: number } @@ -485,8 +486,9 @@ onMounted(async () => {