diff --git a/.eslintrc.json b/.eslintrc.json index 3722418..ca4b8e9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,3 +1,6 @@ { - "extends": ["next/core-web-vitals", "next/typescript"] + "extends": ["next/core-web-vitals", "next/typescript"], + "rules": { + "@next/next/no-img-element": "off" // 或者 "error",取决于你希望是警告还是错误 + } } diff --git a/package.json b/package.json index 95f0532..37205af 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@emotion/styled": "^11.13.0", "@formatjs/intl-localematcher": "^0.5.5", "@mui/material": "^6.1.3", + "lib-flexible": "^0.3.2", "negotiator": "^0.6.3", "next": "14.2.15", "next-intl": "^3.21.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2bb35d9..b9e24d8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,6 +20,9 @@ importers: '@mui/material': specifier: ^6.1.3 version: 6.1.3(@emotion/react@11.13.3(@types/react@18.3.11)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.11)(react@18.3.1))(@types/react@18.3.11)(react@18.3.1))(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + lib-flexible: + specifier: ^0.3.2 + version: 0.3.2 negotiator: specifier: ^0.6.3 version: 0.6.3 @@ -29,6 +32,9 @@ importers: next-intl: specifier: ^3.21.1 version: 3.21.1(next@14.2.15(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + postcss-pxtorem: + specifier: ^6.1.0 + version: 6.1.0(postcss@8.4.47) react: specifier: ^18 version: 18.3.1 @@ -1279,6 +1285,9 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} + lib-flexible@0.3.2: + resolution: {integrity: sha512-9yowMWA70tKhKdCJDaltY0mNQG4OWo7pWKScnTp9aiSxS7s20ZYlwBRE3335nweOf5qKXVC7sDxJwMPM8/MFZg==} + lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} @@ -1510,6 +1519,11 @@ packages: peerDependencies: postcss: ^8.2.14 + postcss-pxtorem@6.1.0: + resolution: {integrity: sha512-ROODSNci9ADal3zUcPHOF/K83TiCgNSPXQFSbwyPHNV8ioHIE4SaC+FPOufd8jsr5jV2uIz29v1Uqy1c4ov42g==} + peerDependencies: + postcss: ^8.0.0 + postcss-selector-parser@6.1.2: resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==} engines: {node: '>=4'} @@ -3354,6 +3368,8 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 + lib-flexible@0.3.2: {} + lilconfig@2.1.0: {} lilconfig@3.1.2: {} @@ -3568,6 +3584,10 @@ snapshots: postcss: 8.4.47 postcss-selector-parser: 6.1.2 + postcss-pxtorem@6.1.0(postcss@8.4.47): + dependencies: + postcss: 8.4.47 + postcss-selector-parser@6.1.2: dependencies: cssesc: 3.0.0 diff --git a/postcss.config.mjs b/postcss.config.mjs index 9b7148b..482f85b 100644 --- a/postcss.config.mjs +++ b/postcss.config.mjs @@ -5,13 +5,13 @@ const config = { plugins: { tailwindcss: {}, 'postcss-pxtorem': { - rootValue: 20, - unitPrecision: 5, - propList: ['*'], - selectorBlackList: [], - minPixelValue: 0, - mediaQuery: false, - }, + rootValue: 14.4, // 默认的根元素字体大小 + unitPrecision: 5, // 单位转换后保留的精度 + propList: ['*'], // 转换哪些属性,'*' 表示全部 + selectorBlackList: [], // 不转换的类名 + minPixelValue: 0, // 小于或等于`1px`的不转换为`rem` + mediaQuery: false, // 允许在媒体查询中转换`px` + } }, }; diff --git a/public/home/img_3.png b/public/home/img_3.png index 006fc3c..9910682 100644 Binary files a/public/home/img_3.png and b/public/home/img_3.png differ diff --git a/public/home/img_AB.png b/public/home/img_AB.png index f70d8ea..324d861 100644 Binary files a/public/home/img_AB.png and b/public/home/img_AB.png differ diff --git a/public/home/img_Omnichannel.png b/public/home/img_Omnichannel.png index c469d39..379c3b9 100644 Binary files a/public/home/img_Omnichannel.png and b/public/home/img_Omnichannel.png differ diff --git a/public/home/img_bg2.png b/public/home/img_bg2.png index df26da2..c48ead4 100644 Binary files a/public/home/img_bg2.png and b/public/home/img_bg2.png differ diff --git a/public/home/img_mutilan.png b/public/home/img_mutilan.png index c133e93..8d5e78e 100644 Binary files a/public/home/img_mutilan.png and b/public/home/img_mutilan.png differ diff --git a/src/app/[[...lang]]/components/form.tsx b/src/app/[[...lang]]/components/form.tsx index b292f84..bdaa395 100644 --- a/src/app/[[...lang]]/components/form.tsx +++ b/src/app/[[...lang]]/components/form.tsx @@ -26,9 +26,8 @@ export default function Form() { >