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

Compare commits

base: scout666:24be7c61e53db7de4747b97d620bf8084ff62121
Branches Tags
scout666:main
scout666:dev
scout666:wyfMain-dev
scout666:LiWenHao
scout666:zhangyuanshan-5.26
scout666:zhangyuanshan
scout666:xingyy
scout666:qb
scout666:1.0.0
..
compare: scout666:8c0c7bad575abe9c2e8b448acd4594ca25c653bf
Branches Tags
scout666:dev
scout666:wyfMain-dev
scout666:main
scout666:LiWenHao
scout666:zhangyuanshan-5.26
scout666:zhangyuanshan
scout666:xingyy
scout666:qb
scout666:1.0.0

No commits in common. "24be7c61e53db7de4747b97d620bf8084ff62121" and "8c0c7bad575abe9c2e8b448acd4594ca25c653bf" have entirely different histories.
24be7c61e5 ... 8c0c7bad57

8 changed files with 49 additions and 68 deletions
Show Stats Expand all files Collapse all files

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

@ -3,8 +3,6 @@ import { computed } from 'vue'
import { useWindowSize } from '@vueuse/core' import { useWindowSize } from '@vueuse/core'
import size375 from '@/components/customDefaultPage/size375/index.vue' 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 size1920 from '@/components/customDefaultPage/size1920/index.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
@ -17,11 +15,13 @@ const viewComponent = computed(() => {
const viewWidth = width.value const viewWidth = width.value
if (viewWidth <= 450) { if (viewWidth <= 450) {
return size375 return size375
} else if (viewWidth <= 1100) { }
return size768 // else if (viewWidth <= 1100) {
} else if (viewWidth <= 1500) { // return size768;
return size1440 // } else if (viewWidth <= 1500) {
} else if (viewWidth <= 1920 || viewWidth > 1920) { // return size1440;
// }
else if (viewWidth <= 1920 || viewWidth > 1920) {
return size1920 return size1920
} }
}) })
@ -30,7 +30,7 @@ const viewComponent = computed(() => {
<template> <template>
<component :is="viewComponent" v-bind="$attrs"> <component :is="viewComponent" v-bind="$attrs">
<template v-for="(_, slot) in $slots" #[slot]="scope"> <template v-for="(_, slot) in $slots" #[slot]="scope">
<slot :name="slot" v-bind="scope" /> <slot :name="slot" v-bind="scope"/>
</template> </template>
</component> </component>
</template> </template>

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

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

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

@ -1,23 +1,23 @@
<template> <template>
<!-- 通用页脚 --> <!-- 通用页脚 -->
<div class="custom-footer"> <div class="custom-footer">
<span>Copyright &copy; 2024-2027 FiEE</span> <span>Copyright &copy; 2024-2027 FiEE</span>
</div> </div>
</template> </template>
<script setup></script> <script setup></script>
<style scoped lang="scss"> <style scoped lang="scss">
.custom-footer { .custom-footer {
width: 100%; width: 100%;
text-align: center; text-align: center;
padding: 24px 0; padding: 24px 0;
color: #888; color: #888;
// font-size: 15px; font-size: 15px;
font-size: 1.05rem; background: #f7f8fa;
background: #f7f8fa; letter-spacing: 1px;
letter-spacing: 1px; border-top: 1px solid #ececec;
border-top: 1px solid #ececec; z-index: 100;
z-index: 100; }
} </style>
</style>

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

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

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

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

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

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

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

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

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

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