diff --git a/src/assets/logo/logo-white.png b/src/assets/logo/logo-white.png new file mode 100644 index 00000000..aa37821f Binary files /dev/null and b/src/assets/logo/logo-white.png differ diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue index 3e137228..5a4c1522 100644 --- a/src/components/HomePage/homePage.vue +++ b/src/components/HomePage/homePage.vue @@ -15,7 +15,7 @@
-
{{userData.data.name}} +
{{userData.data.name}}
{{userData.level}}
@@ -23,7 +23,7 @@
关注TA 已关注 - 去留言 + 去留言

{{userData.data.sign}}

diff --git a/src/components/Portal/authorImg.vue b/src/components/Portal/authorImg.vue index 4ba53e28..21f9dc3f 100644 --- a/src/components/Portal/authorImg.vue +++ b/src/components/Portal/authorImg.vue @@ -56,7 +56,7 @@ methods:{ toHome() { // ,query:{id:item.objId || item.id} - this.$router.push({path:'/homePage?id='+this.aid}) + this.$router.push({path:'/home/index?id='+this.aid}) } }, watch:{ diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue index b32c94a2..5883b550 100644 --- a/src/components/Portal/authorInfo.vue +++ b/src/components/Portal/authorInfo.vue @@ -73,7 +73,7 @@ import { userAvatarText } from "@/utils/tools.js"; methods:{ toHome() { // ,query:{id:item.objId || item.id} - this.$router.push({path:'/homePage?id='+this.aid}) + this.$router.push({path:'/home/index?id='+this.aid}) } }, watch:{ diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 83e9d3c0..198cc45c 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -75,8 +75,8 @@
- 学员 - 学员 + 学员 + 学员 @@ -97,12 +97,12 @@
-
{{userInfo.name}}
-
{{userInfo.name}}
+
{{userInfo.name}}
+
{{userInfo.name}}
个人中心 - 个人主页 + 个人主页 diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index 55e61e07..22baf9f6 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -8,8 +8,10 @@
+
+
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue index 547225ca..800f09a0 100644 --- a/src/layout/components/TopNav/Index.vue +++ b/src/layout/components/TopNav/Index.vue @@ -4,7 +4,7 @@
@@ -46,7 +46,8 @@
- +
+ 学员 学员 @@ -58,7 +59,19 @@ 管理员 -
{{userInfo.name}}
+
+
+ +
+ {{userInfo.name}} +
+ + 个人中心 + 个人主页 + +
+
+ -
- 登出 -
+
+ 登出 +
@@ -99,7 +112,7 @@ - + diff --git a/src/router/index.js b/src/router/index.js index 14ee8387..48f678c2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -150,21 +150,21 @@ export const constantRoutes = [{ meta: { title: '我的消息', icon: 'dashboard', noCache: true, affix: false }, }, { - path: '/homePage', + path: '/home', hidden: true, component: (resolve) => require(['@/views/homepage/Index'], resolve), name: 'homePage', - redirect: '/homePage/page', + redirect: '/home/index', meta: { title: '主页', icon: 'dashboard', noCache: true, affix: false }, children: [{ - path: 'page', + path: 'index', hidden: true, component: (resolve) => require(['@/views/homepage/page'], resolve), name: 'page', meta: { title: '主页', icon: 'dashboard', noCache: true, affix: true } }, { - path: 'leavingMessage', + path: 'leaving', hidden: true, component: (resolve) => require(['@/views/homepage/leavingMessage'], resolve), name: 'leavingMessage',