From e55e1b2f336b845a569e047d4d47700548394583 Mon Sep 17 00:00:00 2001
From: zhuoda <zhuoluodada@qq.com>
Date: Sat, 11 Jan 2020 08:50:02 +0800
Subject: [PATCH] =?UTF-8?q?v1.0.2=20=E4=BC=98=E5=8C=96home=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84name=E5=8F=96=E5=80=BC=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/smart-admin-ad/ad.vue | 6 +++---
 front/src/router/index.js                  | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/front/src/components/smart-admin-ad/ad.vue b/front/src/components/smart-admin-ad/ad.vue
index 520c3015..43f2d9e1 100644
--- a/front/src/components/smart-admin-ad/ad.vue
+++ b/front/src/components/smart-admin-ad/ad.vue
@@ -7,11 +7,11 @@
     </p>
     <br/>
     <p style="text-align:left;font-size:16px">
-      <font color="#DC143C"><strong>我们开源一套漂亮的代码和一套整洁的代码规范</strong></font>，让大家在这浮躁的代码世界里感受到一股把代码写好的清流！同时又让开发者节省大量的时间，减少加班，快乐工作，热爱生活。
+     我们开源一套漂亮的代码和一套整洁的代码规范，让大家在这浮躁的代码世界里感受到一股把代码写好的清流！同时又让开发者节省大量的时间，减少加班，快乐工作，热爱生活。
     </p>
     <br/>
-    <p style="text-align:left;font-size:16px">
-      <font color="#DC143C"><strong>你的star 是我们最强的动力，感谢支持 => </strong></font>
+    <p style="text-align:left;font-size:20px">
+      <font color="#DC143C"><strong>你的star 是我们最强的动力，感谢支持 ！(^_^)∠※   &nbsp;&nbsp;&nbsp;&nbsp; </strong></font>
      <a target="_blank" href="https://github.com/1024-lab/smart-admin">
       <img style="width: 82px;height: 20px;margin-right: 10px" alt="" src="https://img.shields.io/github/stars/1024-lab/smart-admin.svg?logo=github&style=social">
     </a>
diff --git a/front/src/router/index.js b/front/src/router/index.js
index aeaba49c..5cad7962 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -6,6 +6,9 @@ import iView from 'iview';
 import cookie from '@/lib/cookie';
 import { localRead } from '@/lib/local';
 import { setTitle } from '@/lib/menu-func';
+import config from '@/config';
+
+const { homeName } = config;
 
 Vue.use(Router);
 const router = new Router({
@@ -62,8 +65,12 @@ router.beforeEach((to, from, next) => {
   } else if (token && to.name === LOGIN_PAGE_NAME) {
     // 已登录且要跳转的页面是登录页
     next({
-      name: 'home' // 跳转到home页
+      // 跳转到home页
+      name: homeName
     });
+    setTitle(to, router.app);
+    iView.LoadingBar.finish();
+    window.scrollTo(0, 0);
   } else {
     // 特殊页面直接放行
     if (to.meta.access) {