Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/app/globals.css

next.config.mjs

@@ -5,11 +5,11 @@ const withNextIntl = createNextIntlPlugin();
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-    reactStrictMode: true,
+  reactStrictMode: true,
   transpilePackages: ['antd-mobile'],
-    sassOptions: {
-      prependData: `@import "./src/styles/variables.scss";`
-    },
+  sassOptions: {
+    prependData: `@import "./src/styles/variables.scss";`
+  },
   images: {
     remotePatterns: [
       {

src/app/[locale]/_home/HomeActions.tsx

@@ -60,22 +60,22 @@ const HomeActions: FC<PropsWithChildren<Props>> = (props) => {
                 <div className={"flex justify-center"}>
                     <img
                         className={"mx-[0.1rem] h-[0.35rem] w-[0.35rem]"}
-                        src="https://9f.com/img/telegram.9b8c9ead.png"
+                        src="/9f/telegram.webp"
                         alt=""
                     />
                     <img
                         className={"mx-[0.1rem] h-[0.35rem] w-[0.35rem]"}
-                        src="https://9f.com/img/kwai.b9d0c480.png"
+                        src="/9f/kwai.webp"
                         alt=""
                     />
                     <img
                         className={"mx-[0.1rem] h-[0.35rem] w-[0.35rem]"}
-                        src="https://9f.com/img/tiktok.6637bff7.png"
+                        src="/9f/tiktok.png"
                         alt=""
                     />
                     <img
                         className={"mx-[0.1rem] h-[0.35rem] w-[0.35rem]"}
-                        src="https://9f.com/img/youtube.87fed924.png"
+                        src="/9f/youtube.webp"
                         alt=""
                     />
                 </div>

src/app/[locale]/affiliate/faq/page.scss

@@ -148,7 +148,7 @@
 }
 .van-tab--active {
     color: #323233;
-    font-weight: 500;
+    // font-weight: 500;
 }
 .tabs .van-tab__text {
     font-size: .13rem;
@@ -356,4 +356,4 @@ ul.rules li {
     line-height: 20px;
     cursor: pointer;
 }
-}
+}

src/app/[locale]/page.tsx

@@ -30,3 +30,4 @@ const App: FC<LocalPropsWithChildren> = (props) => {
 };
 
 export default App;
+

src/app/globals.css

@@ -19,22 +19,27 @@
   --swiper-pagination-bullet-inactive-color: hsla(0, 0%, 100%, .8);
 
   --adm-color-text: #fff;
+  --bg-color:#000000;
 }
-html, body {
-    width: 100vw;
-    height: 100%;
-    min-height: 80%;
-}
+
 
 html {
     font-size: 144px;
-    background: #fff !important;
 }
 
 ::-webkit-scrollbar {
   width: 0;
 }
 
+html, body {
+  /* width: 100vw; */
+  height: 100%;
+  min-height: 80%;
+  font-family: helvetica neue, Helvetica, apple sd gothic neo, malgun gothic, Arial, sans-serif;
+  overflow: hidden;
+  background: #f8f8f8;
+}
+
 #app {
     max-width: 4.02rem;
     width: 100vw;
@@ -42,7 +47,7 @@ html {
     margin: 0 auto;
     font-size: 0.14rem;
     position: relative;
-    background: #000;
+    background-color: var(--bg-color);
 }
 
 

src/components/Layout/Sidebar.tsx

@@ -110,17 +110,17 @@ const Sidebar: FC<PropsWithChildren<Props>> = (props) => {
                 <div className={"flex"}>
                     <img
                         className={"mx-[0.1rem] h-[0.35rem] w-[0.35rem]"}
-                        src="https://9f.com/img/telegram.9b8c9ead.png"
+                        src="/9f/telegram.webp"
                         alt=""
                     />
                     <img
                         className={"mx-[0.1rem] h-[0.35rem] w-[0.35rem]"}
-                        src="https://9f.com/img/instagram.9a6f2403.png"
+                        src="/9f/instagram.webp"
                         alt=""
                     />
                     <img
                         className={"mx-[0.1rem] h-[0.35rem] w-[0.35rem]"}
-                        src="https://9f.com/img/kwai.b9d0c480.png"
+                        src="/9f/kwai.webp"
                         alt=""
                     />
                 </div>