diff --git a/index.html b/index.html
index 5f5e983..0709802 100644
--- a/index.html
+++ b/index.html
@@ -7,8 +7,7 @@
-
- FiDA
+ Global Awards
diff --git a/package-lock.json b/package-lock.json
index 80ff45c..cdadf31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
"axios": "^1.3.6",
"crypto-js": "^4.2.0",
"gsap": "^3.13.0",
+ "lodash-es": "^4.17.23",
"normalize.css": "^8.0.1",
"pinia": "^2.0.32",
"pinia-persistedstate-plugin": "^0.1.0",
diff --git a/package.json b/package.json
index 0616005..57df7c3 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"axios": "^1.3.6",
"crypto-js": "^4.2.0",
"gsap": "^3.13.0",
+ "lodash-es": "^4.17.23",
"normalize.css": "^8.0.1",
"pinia": "^2.0.32",
"pinia-persistedstate-plugin": "^0.1.0",
diff --git a/public/css/fonts/ARIAL.ttf b/public/css/fonts/ARIAL.ttf
deleted file mode 100644
index 8682d94..0000000
Binary files a/public/css/fonts/ARIAL.ttf and /dev/null differ
diff --git a/public/css/fonts/ARIALBD.ttf b/public/css/fonts/ARIALBD.ttf
deleted file mode 100644
index a6037e6..0000000
Binary files a/public/css/fonts/ARIALBD.ttf and /dev/null differ
diff --git a/public/css/fonts/ArialMdm.ttf b/public/css/fonts/ArialMdm.ttf
deleted file mode 100644
index 3222b81..0000000
Binary files a/public/css/fonts/ArialMdm.ttf and /dev/null differ
diff --git a/public/css/fonts/InstrumentSans-Bold.ttf b/public/css/fonts/InstrumentSans-Bold.ttf
deleted file mode 100644
index f602dce..0000000
Binary files a/public/css/fonts/InstrumentSans-Bold.ttf and /dev/null differ
diff --git a/public/css/fonts/InstrumentSans-Regular.ttf b/public/css/fonts/InstrumentSans-Regular.ttf
deleted file mode 100644
index 14c6113..0000000
Binary files a/public/css/fonts/InstrumentSans-Regular.ttf and /dev/null differ
diff --git a/public/css/fonts/Poppins-Medium.ttf b/public/css/fonts/Poppins-Medium.ttf
deleted file mode 100644
index 6bcdcc2..0000000
Binary files a/public/css/fonts/Poppins-Medium.ttf and /dev/null differ
diff --git a/public/css/fonts/Poppins-Regular.ttf b/public/css/fonts/Poppins-Regular.ttf
deleted file mode 100644
index 9f0c71b..0000000
Binary files a/public/css/fonts/Poppins-Regular.ttf and /dev/null differ
diff --git a/public/css/fonts/Poppins-SemiBold.ttf b/public/css/fonts/Poppins-SemiBold.ttf
deleted file mode 100644
index 74c726e..0000000
Binary files a/public/css/fonts/Poppins-SemiBold.ttf and /dev/null differ
diff --git a/public/css/fonts/fontFamily.css b/public/css/fonts/fontFamily.css
deleted file mode 100644
index d68bea0..0000000
--- a/public/css/fonts/fontFamily.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 字体定义 */
-@font-face {
- font-family: 'Arial';
- src: url('./ARIAL.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'ArialBold';
- src: url('./ARIALBD.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'ArialMedium';
- src: url('./ArialMdm.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'Poppins';
- src: url('./Poppins-Regular.ttf') format('truetype');
- font-weight: normal;
-}
-
-@font-face {
- font-family: 'PoppinsMedium';
- src: url('./Poppins-Medium.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'PoppinsBold';
- src: url('./Poppins-SemiBold.ttf') format('ttf');
-}
-
-@font-face {
- font-family: 'Instrument';
- src: url('./InstrumentSans-Regular.ttf') format('truetype');
-}
-
-@font-face {
- font-family: 'InstrumentBold';
- src: url('./InstrumentSans-Bold.ttf') format('truetype');
-}
diff --git a/src/assets/css/fonts/fontFamily.css b/src/assets/css/fonts/fontFamily.css
index e7d97b6..564c43e 100644
--- a/src/assets/css/fonts/fontFamily.css
+++ b/src/assets/css/fonts/fontFamily.css
@@ -27,7 +27,7 @@
@font-face {
font-family: 'PoppinsBold';
- src: url('./Poppins-SemiBold.ttf') format('truetype');
+ src: url('./Poppins-SemiBold.woff') format('woff2');
}
@font-face {
diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 2fee134..79a9e73 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -62,3 +62,45 @@ body,
.space-between {
justify-content: space-between;
}
+
+/* 字体定义 */
+@font-face {
+ font-family: 'Arial';
+ src: url('./fonts/ARIAL.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'ArialBold';
+ src: url('./fonts/ARIALBD.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'ArialMedium';
+ src: url('./fonts/ArialMdm.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'Poppins';
+ src: url('./fonts/Poppins-Regular.ttf') format('truetype');
+ font-weight: normal;
+}
+
+@font-face {
+ font-family: 'PoppinsMedium';
+ src: url('./fonts/Poppins-Medium.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'PoppinsBold';
+ src: url('./fonts/Poppins-SemiBold.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'Instrument';
+ src: url('./fonts/InstrumentSans-Regular.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'InstrumentBold';
+ src: url('./fonts/InstrumentSans-Bold.ttf') format('truetype');
+}
\ No newline at end of file
diff --git a/src/assets/css/style.less b/src/assets/css/style.less
index dca86b8..45eaec1 100644
--- a/src/assets/css/style.less
+++ b/src/assets/css/style.less
@@ -7,34 +7,36 @@ h1,
h2,
h3,
p {
- margin: 0;
- padding: 0;
+ margin: 0;
+ padding: 0;
}
* {
- box-sizing: border-box;
+ box-sizing: border-box;
}
html,
body,
#app {
- width: 100%;
- height: 100%;
- overflow: hidden;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
}
@keyframes loading {
- 0% {
- transform: rotate(0deg);
- }
+ 0% {
+ transform: rotate(0deg);
+ }
- 100% {
- transform: rotate(360deg);
- }
+ 100% {
+ transform: rotate(360deg);
+ }
}
.background-pink {
- background-color: rgba(248, 247, 245, 1);
- background-image: url('@/assets/images/home-bg.png');
- background-size: 100% 100%;
-}
\ No newline at end of file
+ background-color: rgba(248, 247, 245, 1);
+ background-image: url('@/assets/images/home-bg.png');
+ background-size: 100% 100%;
+}
+
+
diff --git a/src/main.ts b/src/main.ts
index bee4635..d248983 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -7,7 +7,6 @@ import 'normalize.css'
import './assets/css/style.css'
import SvgIcon from "@/components/SvgIcon/index.vue";
import "virtual:svg-icons-register";
-// import './assets/css/fonts/fontFamily.css'
import i18n from "./lang/index";
diff --git a/vite.config.ts b/vite.config.ts
index a144432..1e30bae 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,7 +7,7 @@ import Components from 'unplugin-vue-components/vite'
import DefineOptions from 'unplugin-vue-define-options/vite'
import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
import path from 'path'
-import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
+import { ElementPlusResolver, AntDesignVueResolver } from 'unplugin-vue-components/resolvers'
// console.log(process)
// console.log(import.meta.env.VITE_APP_URL)
@@ -15,64 +15,85 @@ import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
// https://vitejs.dev/config/
export default defineConfig(({ mode }) => {
- const env = loadEnv(mode, process.cwd())
+ const env = loadEnv(mode, process.cwd())
- return {
- plugins: [
- vue(),
- DefineOptions(),
- // ...
- AutoImport({
- resolvers: [ElementPlusResolver()],
- }),
- Components({
- resolvers: [ElementPlusResolver()],
- }),
- createSvgIconsPlugin({
- // 指定需要缓存的图标文件夹
- iconDirs: [path.resolve(process.cwd(), 'src/assets/icons')],
- // 指定symbolId格式
- symbolId: 'icon-[dir]-[name]',
- inject: 'body-last' // 注入位置优化
- })
- ],
- define: {
- __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false,
- },
- css: {
- preprocessorOptions: {
- less: {
- modifyVars: {
- 'primary-color': '#ec6800'
- },
- javascriptEnabled: true,
- // 全局导入less变量文件
- additionalData: `@import "${path.resolve(__dirname, 'src/assets/css/style.less')}";`
- }
- }
- },
- resolve: {
- alias: {
- '@': fileURLToPath(new URL('./src', import.meta.url)),
- _c: fileURLToPath(new URL('./src/components', import.meta.url))
- }
- },
- server: {
- host: '0.0.0.0', // 允许局域网内的IP访问
- port: 8060, // 根据环境设置端口
- open: true, // 自动打开浏览器
- strictPort: true, // 如果端口已被占用，则尝试下一个可用端口
- hmr: {
- overlay: true
- },
- proxy: {
- '/api': {
- //'/api'是自行设置的请求前缀
- target: env.VITE_APP_URL,
- changeOrigin: true, //用于控制请求头中的host值
- rewrite: (path) => path.replace(/^\/api/, '/api') //路径重写，（正则）匹配以api开头的路径为空（将请求前缀删除）
- }
- }
- }
- }
+ return {
+ plugins: [
+ vue(),
+ DefineOptions(),
+ // ...
+ AutoImport({
+ resolvers: [ElementPlusResolver()],
+ imports: [
+ 'vue',
+ 'vue-router',
+ {
+ 'lodash-es': [
+ 'debounce',
+ 'cloneDeep',
+ 'cloneDeepWith',
+ 'isBoolean',
+ 'isString',
+ 'isNumber',
+ 'isArray',
+ 'isDate',
+ 'isFunction',
+ 'isNaN',
+ 'isNull',
+ 'isObject',
+ 'isUndefined'
+ ]
+ }
+ ],
+ }),
+ Components({
+ resolvers: [ElementPlusResolver(), AntDesignVueResolver({ importStyle: false })]
+ }),
+ createSvgIconsPlugin({
+ // 指定需要缓存的图标文件夹
+ iconDirs: [path.resolve(process.cwd(), 'src/assets/icons')],
+ // 指定symbolId格式
+ symbolId: 'icon-[dir]-[name]',
+ inject: 'body-last' // 注入位置优化
+ })
+ ],
+ define: {
+ __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false
+ },
+ css: {
+ preprocessorOptions: {
+ less: {
+ modifyVars: {
+ 'primary-color': '#ec6800'
+ },
+ javascriptEnabled: true,
+ // 全局导入less变量文件
+ additionalData: `@import "${path.resolve(__dirname, 'src/assets/css/style.less')}";`
+ }
+ }
+ },
+ resolve: {
+ alias: {
+ '@': fileURLToPath(new URL('./src', import.meta.url)),
+ _c: fileURLToPath(new URL('./src/components', import.meta.url))
+ }
+ },
+ server: {
+ host: '0.0.0.0', // 允许局域网内的IP访问
+ port: 8060, // 根据环境设置端口
+ open: true, // 自动打开浏览器
+ strictPort: true, // 如果端口已被占用，则尝试下一个可用端口
+ hmr: {
+ overlay: true
+ },
+ proxy: {
+ '/api': {
+ //'/api'是自行设置的请求前缀
+ target: env.VITE_APP_URL,
+ changeOrigin: true, //用于控制请求头中的host值
+ rewrite: (path) => path.replace(/^\/api/, '/api') //路径重写，（正则）匹配以api开头的路径为空（将请求前缀删除）
+ }
+ }
+ }
+ }
})