diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 794a0d4..d0a4785 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -13,6 +13,7 @@ p { } * { box-sizing: border-box; + font-family: Poppins; } h1, h2, diff --git a/src/assets/css/style.less b/src/assets/css/style.less index e29e6ca..c58fe7d 100644 --- a/src/assets/css/style.less +++ b/src/assets/css/style.less @@ -14,6 +14,7 @@ p { * { box-sizing: border-box; + font-family: Poppins; } h1, diff --git a/src/assets/fonts/fontFamily.css b/src/assets/fonts/fontFamily.css new file mode 100644 index 0000000..f3159ae --- /dev/null +++ b/src/assets/fonts/fontFamily.css @@ -0,0 +1,5 @@ +/* 字体定义 */ +@font-face { + font-family: 'Poppins'; + src: url('./poppins.woff2') format('woff2'); +} diff --git a/src/assets/fonts/poppins.woff2 b/src/assets/fonts/poppins.woff2 new file mode 100644 index 0000000..b69e009 Binary files /dev/null and b/src/assets/fonts/poppins.woff2 differ diff --git a/src/directives/tween-animation.ts b/src/directives/tween-animation.ts index 3d12db2..64f5001 100644 --- a/src/directives/tween-animation.ts +++ b/src/directives/tween-animation.ts @@ -1,14 +1,14 @@ import { gsap, } from 'gsap' import { ScrollTrigger } from 'gsap/ScrollTrigger' export default { - name: 'tween-Y', + name: 'tween', mounted(el: HTMLElement, binding: any) { const params = binding.value // if(!binding.value.isGsap)return let dom = document.querySelector('body') gsap.registerPlugin(ScrollTrigger); let tl1 = gsap.timeline(); - tl1.from(el,1, {y:params || '30px',opacity:0},) + tl1.from(el,1, params,) ScrollTrigger.create({ trigger: el, // 触发器元素 start: "top 90%", // 滚动触发器的起始滚动位置 diff --git a/src/lang/index.ts b/src/lang/index.ts index 9a14c68..e7e6d30 100644 --- a/src/lang/index.ts +++ b/src/lang/index.ts @@ -1,8 +1,8 @@ import { createI18n } from 'vue-i18n' -import enLocale from './en.ts' -import zhCnLocale from './zh-cn.ts' -import zhTwLocale from './zh-tw.ts' +import enLocale from './en' +import zhCnLocale from './zh-cn' +import zhTwLocale from './zh-tw' export const LangType = { en: "en", // 英文 diff --git a/src/pages/about-us/strategic-partners.vue b/src/pages/about-us/strategic-partners.vue index 34635b9..6f216be 100644 --- a/src/pages/about-us/strategic-partners.vue +++ b/src/pages/about-us/strategic-partners.vue @@ -20,8 +20,8 @@ const {} = toRefs(data);