diff --git a/src/App.vue b/src/App.vue index 385a6a1..bb89734 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,8 +13,8 @@ import PublicComponent from '@/components/PublicComponent/PublicComponent.vue' body, html, #app { - width: 1080px; - height: 1920px; + width: 100vw; + height: 100vh; background-color: var(--global-appBackground); overflow: hidden; } diff --git a/src/base/Temperature/Temperature.vue b/src/base/Temperature/Temperature.vue index 1b0e58b..8d7149a 100644 --- a/src/base/Temperature/Temperature.vue +++ b/src/base/Temperature/Temperature.vue @@ -21,6 +21,12 @@ const { weather, icon } = useWeather() align-items: center; z-index: 11; } +@media (min-aspect-ratio: 1/1) { + .Temperature-wrapper { + top: 32px; + } +} + .weather-icon { color: var(--weather-iconColor); font-size: 36px; diff --git a/src/base/Time/Time.vue b/src/base/Time/Time.vue index 43e5ee3..cb2fa72 100644 --- a/src/base/Time/Time.vue +++ b/src/base/Time/Time.vue @@ -50,4 +50,18 @@ const { dateRef, whichWeekRef } = useDay() color: var(--time-weekColor); z-index: 11; } +@media (min-aspect-ratio: 1/1) { + .time { + top: 32px; + left: 1499px; + } + .month { + top: 38px; + left: 1623px; + } + .week { + top: 54px; + left: 1623px; + } +} diff --git a/src/components/PublicComponent/SearchBar.vue b/src/components/PublicComponent/SearchBar.vue index a0793ab..a3a51cc 100644 --- a/src/components/PublicComponent/SearchBar.vue +++ b/src/components/PublicComponent/SearchBar.vue @@ -18,14 +18,18 @@ const { theme } = storeToRefs(store) diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue index 5ed9aae..62da433 100644 --- a/src/components/Search/Search.vue +++ b/src/components/Search/Search.vue @@ -58,7 +58,6 @@ import { useFacilityNav } from '@/composables/useFacilityNav' import { useStatistics } from '@/composables/useStatistics' import Dialog from '@/layouts/Dialog.vue' import FacilityItem from '@/base/FacilityItem/FacilityItem.vue' -import Tabs from '@/components/Tabs/Tabs.vue' import SearchResultList from '@/components/SearchResultList/SearchResultList.vue' const KeyboardByLetter = defineAsyncComponent(() => import('@/components/KeyboardByLetter/KeyboardByLetter.vue')) diff --git a/src/layouts/View.vue b/src/layouts/View.vue index 74eda5d..f9c8254 100644 --- a/src/layouts/View.vue +++ b/src/layouts/View.vue @@ -42,5 +42,16 @@ defineProps({ height: 515px; } } + @media (min-aspect-ratio: 1/1) { + .bgTop { + height: 280px; + &.long { + height: 280px; + } + &.mid { + height: 280px; + } + } + } } diff --git a/src/themes/main/billboardLoc.png b/src/themes/main/billboardLoc.png new file mode 100644 index 0000000..eb3e38c Binary files /dev/null and b/src/themes/main/billboardLoc.png differ diff --git a/src/themes/main/style.json b/src/themes/main/style.json index 54d9f3b..db3b91c 100644 --- a/src/themes/main/style.json +++ b/src/themes/main/style.json @@ -81,7 +81,7 @@ "billboard": { "background": "#dee6f6", "arrowRadius": "100px", - "legendColor": "rgba(255, 255, 255, 0.6)", + "legendColor": "rgba(0, 0, 0, 0.6)", "titleColor": "#000000", "metaColor": "rgba(0, 0, 0, 0.6)" }, diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue index c11adf0..ba78403 100644 --- a/src/views/Index/Index.vue +++ b/src/views/Index/Index.vue @@ -15,51 +15,50 @@
-
-
-
-
找店
-
{{ guideDesc }}
- -
-
当前位置
-
{{ bf }}
-
- - 扫我导航 -
+
+
+
找店
+
{{ guideDesc }}
+
-
-
-

推荐美食

-

此时此刻,美食正在等你

-
-
- -
+
当前位置
+
{{ bf }}
+
+ + 扫我导航
-
-
-

推荐品牌

-

心动之选,拥抱美好生活

-
-
- -
+
+
+
+

推荐美食

+

此时此刻,美食正在等你

+
+
+
-
+
+
+

推荐品牌

+

心动之选,拥抱美好生活

+
+
+ +
+
+ + -
+