Merge branch 'shiy' into awen

# Conflicts:
#	app/root.tsx

app/root.tsx

@@ -14,7 +14,7 @@ import { Layout } from "~/components/layout/Layout";
 import { ErrorBoundary as AppErrorBoundary } from "~/components/error/ErrorBoundary";
 import "remixicon/fonts/remixicon.css";
 // 导入样式
-import mainStyles from "~/styles/main.css?url";
+import styles from "~/styles/main.css?url";
 
 // 添加客户端hydration错误处理
 // if (typeof window !== "undefined") {
@@ -42,10 +42,10 @@ export const meta: MetaFunction = () => {
 // 使用links函数为应用加载CSS和其他资源
 export function links() {
   return [
-    { rel: "stylesheet", href: mainStyles },
-    { rel: "preconnect", href: "https://fonts.googleapis.com" },
-    { rel: "preconnect", href: "https://fonts.gstatic.com", crossOrigin: "anonymous" },
-    { rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@400;500;700&display=swap" }
+    { rel: "stylesheet", href: styles },
+    // { rel: "preconnect", href: "https://fonts.googleapis.com" },
+    // { rel: "preconnect", href: "https://fonts.gstatic.com", crossOrigin: "anonymous" },
+    // { rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@400;500;700&display=swap" }
   ];
 }