diff --git a/src/permission.js b/src/permission.js
index 5b950ce..7710383 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
+import { getToken, setAdminId, setToken } from '@/utils/auth'
 import { isRelogin } from '@/utils/request'
 
 NProgress.configure({ showSpinner: false })
@@ -12,43 +12,60 @@ const whiteList = ['/login', '/auth-redirect', '/bind', '/register',"/forgetPass
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
-  if (getToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
-    /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
-    } else {
-      if (store.getters.roles.length === 0) {
-        isRelogin.show = true
-        // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-          })
-        }).catch(err => {
+  // 获取当前URL
+  var url = new URL(window.location.href);
+
+// 获取minid的值
+  if (url.searchParams.has('minid')) {
+    var adminId = url.searchParams.get("minid");
+    var token = url.searchParams.get("tk");
+    setToken(token);
+    setAdminId(adminId);
+    store.commit("SET_TOKEN", token);
+    store.commit("SET_ADMINID",adminId);
+    var baseUrl = url.origin + url.pathname + url.hash;
+    console.log(baseUrl);
+    window.location.href = baseUrl
+  }else {
+    if (getToken()) {
+      to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+      /* has token*/
+      if (to.path === '/login') {
+        next({ path: '/' })
+        NProgress.done()
+      } else {
+        if (store.getters.roles.length === 0) {
+          isRelogin.show = true
+          // 判断当前用户是否已拉取完user_info信息
+          store.dispatch('GetInfo').then(() => {
+            isRelogin.show = false
+            store.dispatch('GenerateRoutes').then(accessRoutes => {
+              // 根据roles权限生成可访问的路由表
+              router.addRoutes(accessRoutes) // 动态添加可访问路由表
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            })
+          }).catch(err => {
             store.dispatch('LogOut').then(() => {
               Message.error(err)
               next({ path: '/' })
             })
           })
-      } else {
-        next()
+        } else {
+          next()
+        }
       }
-    }
-  } else {
-    // 没有token
-    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录白名单，直接进入
-      next()
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      NProgress.done()
+      // 没有token
+      if (whiteList.indexOf(to.path) !== -1) {
+        // 在免登录白名单，直接进入
+        next()
+      } else {
+        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        NProgress.done()
+      }
     }
   }
+
 })
 
 router.afterEach(() => {