scout666/fiee-official-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wyfMain-dev'

Browse Source
This commit is contained in:
wangyifeng 2025-05-23 16:18:02 +08:00
commit 24be7c61e5
8 changed files with 68 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/customDefaultPage/index.vue
View File

@ -3,6 +3,8 @@ import { computed } from 'vue'
import { useWindowSize } from '@vueuse/core'
import size375 from '@/components/customDefaultPage/size375/index.vue'
import size768 from '@/components/customDefaultPage/size1920/index.vue'
import size1440 from '@/components/customDefaultPage/size1920/index.vue'
import size1920 from '@/components/customDefaultPage/size1920/index.vue'
import { useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
@ -15,13 +17,11 @@ const viewComponent = computed(() => {
const viewWidth = width.value
if (viewWidth <= 450) {
return size375
}
// else if (viewWidth <= 1100) {
// return size768;
// } else if (viewWidth <= 1500) {
// return size1440;
// }
else if (viewWidth <= 1920 || viewWidth > 1920) {
} else if (viewWidth <= 1100) {
return size768
} else if (viewWidth <= 1500) {
return size1440
} else if (viewWidth <= 1920 || viewWidth > 1920) {
return size1920
}
})

14
src/components/customFooter/index.vue
View File

@ -3,6 +3,8 @@ import { computed } from 'vue'
import { useWindowSize } from '@vueuse/core'
import size375 from '@/components/customFooter/size375/index.vue'
import size768 from '@/components/customFooter/size1920/index.vue'
import size1440 from '@/components/customFooter/size1920/index.vue'
import size1920 from '@/components/customFooter/size1920/index.vue'
import { useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
@ -15,13 +17,11 @@ const viewComponent = computed(() => {
const viewWidth = width.value
if (viewWidth <= 450) {
return size375
}
// else if (viewWidth <= 1100) {
// return size768;
// } else if (viewWidth <= 1500) {
// return size1440;
// }
else if (viewWidth <= 1920 || viewWidth > 1920) {
} else if (viewWidth <= 1100) {
return size768
} else if (viewWidth <= 1500) {
return size1440
} else if (viewWidth <= 1920 || viewWidth > 1920) {
return size1920
}
})

4
src/components/customFooter/size1920/index.vue
View File

@ -13,11 +13,11 @@
text-align: center;
padding: 24px 0;
color: #888;
font-size: 15px;
// font-size: 15px;
font-size: 1.05rem;
background: #f7f8fa;
letter-spacing: 1px;
border-top: 1px solid #ececec;
z-index: 100;
}
</style>

14
src/components/customHeader/index.vue
View File

@ -3,6 +3,8 @@ import { computed } from 'vue'
import { useWindowSize } from '@vueuse/core'
import size375 from '@/components/customHeader/size375/index.vue'
import size768 from '@/components/customHeader/size375/index.vue'
import size1440 from '@/components/customHeader/size1920/index.vue'
import size1920 from '@/components/customHeader/size1920/index.vue'
import { useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
@ -15,13 +17,11 @@ const viewComponent = computed(() => {
const viewWidth = width.value
if (viewWidth <= 450) {
return size375
}
// else if (viewWidth <= 1100) {
// return size768;
// } else if (viewWidth <= 1500) {
// return size1440;
// }
else if (viewWidth <= 1920 || viewWidth > 1920) {
} else if (viewWidth <= 768) {
return size768
} else if (viewWidth <= 1500) {
return size1440
} else if (viewWidth <= 1920 || viewWidth > 1920) {
return size1920
}
})

5
src/components/customHeader/size1920/index.vue
View File

@ -81,7 +81,7 @@ const handleToHome = () => {
<style scoped lang="scss">
.custom-header {
--header-height: 80px;
--header-height: 5rem;
--primary-color: #8b59f7;
transition: all 0.3s ease;
background: transparent;
@ -133,7 +133,8 @@ const handleToHome = () => {
margin: 0 20px;
transition: all 0.3s ease;
font-weight: 700;
font-size: 16px;
// font-size: 16px;
font-size: 1.05rem;
min-width: 120px;
text-align: center;

8
src/views/events-calendar/index.vue
View File

@ -4,8 +4,10 @@
</div>
</template>
<script setup>
import size1920 from '@/views/events-calendar/size1920/index.vue'
import size375 from '@/views/events-calendar/size375/index.vue'
import size768 from '@/views/events-calendar/size375/index.vue'
import size1440 from '@/views/events-calendar/size1920/index.vue'
import size1920 from '@/views/events-calendar/size1920/index.vue'
import { computed } from 'vue'
import { useWindowSize } from '@vueuse/core'
@ -14,6 +16,10 @@ const viewComponent = computed(() => {
const viewWidth = width.value
if (viewWidth <= 450) {
return size375
} else if (viewWidth <= 768) {
return size768
} else if (viewWidth <= 1500) {
return size1440
} else if (viewWidth <= 1920 || viewWidth > 1920) {
return size1920
}

8
src/views/index/index.vue
View File

@ -1,6 +1,8 @@
<script setup>
import size1920 from '@/views/index/size1920/index.vue'
import size375 from '@/views/index/size375/index.vue'
import size768 from '@/views/index/size1920/index.vue'
import size1440 from '@/views/index/size1920/index.vue'
import size1920 from '@/views/index/size1920/index.vue'
import { computed } from 'vue'
import { useWindowSize } from '@vueuse/core'
@ -9,6 +11,10 @@ const viewComponent = computed(() => {
const viewWidth = width.value
if (viewWidth <= 450) {
return size375
} else if (viewWidth <= 1100) {
return size768
} else if (viewWidth <= 1500) {
return size1440
} else if (viewWidth <= 1920 || viewWidth > 1920) {
return size1920
}

8
src/views/press-releases/index.vue
View File

@ -4,8 +4,10 @@
</div>
</template>
<script setup>
import size1920 from '@/views/press-releases/size1920/index.vue'
import size375 from '@/views/press-releases/size375/index.vue'
import size768 from '@/views/press-releases/size375/index.vue'
import size1440 from '@/views/press-releases/size1920/index.vue'
import size1920 from '@/views/press-releases/size1920/index.vue'
import { computed } from 'vue'
import { useWindowSize } from '@vueuse/core'
@ -14,6 +16,10 @@ const viewComponent = computed(() => {
const viewWidth = width.value
if (viewWidth <= 450) {
return size375
} else if (viewWidth <= 768) {
return size768
} else if (viewWidth <= 1500) {
return size1440
} else if (viewWidth <= 1920 || viewWidth > 1920) {
return size1920
}