diff --git a/src/base/Temperature/Temperature.vue b/src/base/Temperature/Temperature.vue index f219d9b..1b0e58b 100644 --- a/src/base/Temperature/Temperature.vue +++ b/src/base/Temperature/Temperature.vue @@ -22,7 +22,7 @@ const { weather, icon } = useWeather() z-index: 11; } .weather-icon { - color: #000000; + color: var(--weather-iconColor); font-size: 36px; font-weight: bolder; font-family: 'font_bold'; @@ -34,7 +34,7 @@ const { weather, icon } = useWeather() font-size: 36px; line-height: 44px; letter-spacing: 0.05em; - color: #000000; + color: var(--weather-textColor); margin-right: 12px; } diff --git a/src/base/Time/Time.vue b/src/base/Time/Time.vue index de2b606..43e5ee3 100644 --- a/src/base/Time/Time.vue +++ b/src/base/Time/Time.vue @@ -23,7 +23,7 @@ const { dateRef, whichWeekRef } = useDay() font-weight: 700; font-size: 36px; line-height: 44px; - color: #000; + color: var(--time-timeColor); z-index: 11; } .month { @@ -36,6 +36,7 @@ const { dateRef, whichWeekRef } = useDay() font-size: 13px; line-height: 16px; z-index: 11; + color: var(--time-monthColor); } .week { position: fixed; @@ -46,7 +47,7 @@ const { dateRef, whichWeekRef } = useDay() font-weight: 700; font-size: 13px; line-height: 16px; - color: #516dd8; + color: var(--time-weekColor); z-index: 11; } diff --git a/src/components/BrandScroll/BrandScroll.vue b/src/components/BrandScroll/BrandScroll.vue index 7ba1081..98f1197 100644 --- a/src/components/BrandScroll/BrandScroll.vue +++ b/src/components/BrandScroll/BrandScroll.vue @@ -128,7 +128,7 @@ watch([scroll, () => props.shop], () => { font-weight: 900; font-size: 32px; line-height: 38px; - color: rgba(0, 0, 0, 0.8); + color: var(--brand-floorNameColor); padding-bottom: 24px; display: flex; align-items: baseline; @@ -137,7 +137,7 @@ watch([scroll, () => props.shop], () => { font-weight: 500; font-size: 20px; line-height: 23px; - color: rgba(0, 0, 0, 0.6); + color: var(--brand-floorMetaColor); } .current { display: flex; diff --git a/src/components/CarouselWithIntro/CarouselWithIntro.vue b/src/components/CarouselWithIntro/CarouselWithIntro.vue index 8b37f86..f7d4bcc 100644 --- a/src/components/CarouselWithIntro/CarouselWithIntro.vue +++ b/src/components/CarouselWithIntro/CarouselWithIntro.vue @@ -94,7 +94,7 @@ const qr = computed(() => props.data.qrFileList ?? []) font-weight: 700; font-size: 28px; line-height: 150%; - color: rgba(0, 0, 0, 0.8); + color: var(--carousel-titleColor); } .intro-scroll { @@ -111,7 +111,7 @@ const qr = computed(() => props.data.qrFileList ?? []) font-size: 16px; line-height: 200%; text-align: justify; - color: rgba(0, 0, 0, 0.6); + color: var(--carousel-introColor); } } diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index a03a7f7..632ec18 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -33,6 +33,7 @@ const { shop } = storeToRefs(store) width: 1080px; z-index: 10; overflow: hidden; + background: var(--map-background); &.billboard { pointer-events: none; } diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue index 95ba938..e836f1a 100644 --- a/src/components/PublicComponent/PublicComponent.vue +++ b/src/components/PublicComponent/PublicComponent.vue @@ -75,6 +75,12 @@ onMounted(() => { timer.value = setInterval(() => { send(`type:online`) }, 30000) + let i = 0 + store.SET_CURRENT_THEME('main') + setInterval(() => { + i++ + store.SET_CURRENT_THEME(['main', 'fashion'][i % 2]) + }, 10000) window.addEventListener('touchend', checkHandleScreen) }) onBeforeUnmount(() => { diff --git a/src/components/PublicComponent/SearchBar.vue b/src/components/PublicComponent/SearchBar.vue index 521b66f..53d4204 100644 --- a/src/components/PublicComponent/SearchBar.vue +++ b/src/components/PublicComponent/SearchBar.vue @@ -1,6 +1,6 @@