合并冲突

Change-Id: I3b6ac5ae87aad8fe746eceecc8f92fc5574b50a8
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',