From f92322983625b673e131e83db593c4d4b830197e Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Wed, 3 Feb 2021 17:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E5=90=8E=E8=B7=B3=E8=BD=AC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/{facion.ico => favicon.ico} | Bin
 public/index.html                  |   2 +-
 src/permission.js                  |   3 +--
 src/views/login/index.vue          |  14 +++++++++++---
 4 files changed, 13 insertions(+), 6 deletions(-)
 rename public/{facion.ico => favicon.ico} (100%)

diff --git a/public/facion.ico b/public/favicon.ico
similarity index 100%
rename from public/facion.ico
rename to public/favicon.ico
diff --git a/public/index.html b/public/index.html
index 28d9c8a..cfbfdaa 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,7 +8,7 @@
      <!--在 head 标签中添加 meta 标签，并设置 viewport-fit=cover 值-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
 
-    <link rel="icon" href="<%= BASE_URL %>facion.ico">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
 
   </head>
diff --git a/src/permission.js b/src/permission.js
index 2112611..0fe50f6 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -12,7 +12,6 @@ const whiteList = ['/login','/s','/s_m','/share'] // 白名单
 router.beforeEach(async(to, from, next) => {
   // 开始进度条
   NProgress.start()
-
   // 设置页面标题
   document.title = getPageTitle(to.meta.title)
 
@@ -53,7 +52,7 @@ router.beforeEach(async(to, from, next) => {
       next()
     } else {
       // 其他没有token重定向到登录页面。
-      next(`/login?redirect=${to.path}`)
+      next(`/login?redirect=${window.location.pathname}`)
       NProgress.done()
     }
   }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ebfdc67..83443a7 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -5,7 +5,6 @@
     <div id='stars2'></div>
     <div id='stars3'></div>
 
-    <!--<img src="http://localhost:9528/file/public/s/preview/login-bg.png?fileIds=5eca6fe63c9ae7058035e99b">-->
     <el-card class="box-card">
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
 
@@ -93,6 +92,7 @@
 <script>
 import { hasUser, initialization } from '@/api/user'
 import { getRememberName } from '@/utils/auth'
+import store from "@/store";
 
 export default {
   name: 'Login',
@@ -148,6 +148,9 @@ export default {
     $route: {
       handler: function(route) {
         this.redirect = route.query && route.query.redirect
+        if(route.query.path){
+          this.redirect += `&path=${route.query.path}`
+        }
       },
       immediate: true
     }
@@ -192,8 +195,13 @@ export default {
             // 登录
             this.loading = true
             this.$store.dispatch('user/login', this.loginForm).then(() => {
-              this.$router.push({ path: this.redirect || '/' })
-              this.loading = false
+              this.$store.dispatch('user/setMenuList').then((res) => {
+                console.log(this.redirect)
+                this.$router.push({ path: this.redirect || '/' })
+                this.loading = false
+              }).catch(() => {
+                this.loading = false
+              })
             }).catch(() => {
               this.loading = false
             })