commit f8f8184430dc6bc268f620a2d611051e7b97ded6
author zhaoyumao <2451882060@qq.com> Mon Jun 09 00:00:46 2025 +0800
committer zhaoyumao <2451882060@qq.com> Mon Jun 09 00:00:46 2025 +0800
tree e14e9240edd660858016446fa68dd38b57c69fdd
parent 4367e46811418aa4c48df8e4eb267d6802204597

合并冲突

Change-Id: I3b6ac5ae87aad8fe746eceecc8f92fc5574b50a8

config/defaultSettings.ts

diff --git a/config/defaultSettings.ts b/config/defaultSettings.ts
index 2796a7e..97bac47 100644
--- a/config/defaultSettings.ts
+++ b/config/defaultSettings.ts
@@ -7,18 +7,19 @@
   pwa?: boolean;
   logo?: string;
 } = {
-  navTheme: 'light',
+  navTheme: 'realDark',
   // 拂晓蓝
-  colorPrimary: '#1890ff',
-  layout: 'mix',
+  colorPrimary: '#13C2C2',
+  layout: 'top',
   contentWidth: 'Fluid',
-  fixedHeader: false,
+  fixedHeader: true,
   fixSiderbar: true,
   colorWeak: false,
-  title: 'Ant Design Pro',
+  title: 'ThunderHub',
   pwa: true,
-  logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
+  logo: './logo.svg',
   iconfontUrl: '',
+  splitMenus: false,
   token: {
     // 参见ts声明，demo 见文档，通过token 修改样式
     //https://procomponents.ant.design/components/layout#%E9%80%9A%E8%BF%87-token-%E4%BF%AE%E6%94%B9%E6%A0%B7%E5%BC%8F

config/routes.ts

diff --git a/config/routes.ts b/config/routes.ts
index fa049b0..d380d7c 100644
--- a/config/routes.ts
+++ b/config/routes.ts
@@ -13,8 +13,15 @@
 export default [
   {
     path: '/',
-    redirect: '/account/center',
+    // redirect: '/home',
+    component: './Home/index.tsx',
   },
+  // {
+  //   name: 'home',
+  //   path: '/home',
+  //   layout: false,
+  //   component: './Home',
+  // },
   {
     path: '*',
     layout: false,
@@ -95,10 +102,12 @@
     icon: 'read',
     routes: [
       {
-        path: '/bounty/list',
+        name: '悬赏列表',
+        path: '/bounty',
         component: '@/pages/Bounty/List',
       },
       {
+        name: '悬赏详情',
         path: '/bounty/detail/:id',
         component: '@/pages/Bounty/Detail',
       },
@@ -120,7 +129,7 @@
   {
     name: '帖子中心',
     icon: 'read',
-    path: '/post/center',
+    path: '/postCenter',
     component: './PostCenter/index.tsx',
   },
   {
@@ -159,13 +168,19 @@
     component: './Torrent/torrentUpload.tsx',
     hideInMenu: true,
   },
-    {
+  {
+    name: '星球交流',
+    path: '/relation',
+    component: './Relation/index.tsx',
+  },
+
+  {
     name: '审核种子界面',
     path: '/torrent-audit-list',
     component: './Torrent/torrentAuditList.tsx',
     hideInMenu: true,
   },
-{
+  {
     name: '审核种子详情界面',
     path: '/torrent-audit/:id',
     component: './Torrent/torrentAudit.tsx',