diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 6d93825..8a61dca 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -142,15 +142,19 @@ export default {
             //   ? "/demo/suzhouyingjiPC/"
             //   : "/";
 
-            let isGovernmentAffairsNetwork = localStorage.getItem('isGovernmentAffairsNetwork')
-            if(process.env.NODE_ENV === "production") {
-              if(isGovernmentAffairsNetwork == '1') {
-                location.href = process.env.VUE_APP_LOCATION + '/sso-server/oauth2/login?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
+            let isGovernmentAffairsNetwork = localStorage.getItem(
+              "isGovernmentAffairsNetwork"
+            );
+            if (process.env.NODE_ENV === "production") {
+              if (isGovernmentAffairsNetwork == "1") {
+                location.href =
+                  process.env.VUE_APP_LOCATION +
+                  "/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code";
               } else {
-                location.href = "/login"
+                location.href = "/login";
               }
             } else {
-              location.href = "/"
+              location.href = "/";
             }
           });
         })
diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
index d169905..64bd813 100644
--- a/src/layout/newyjLayout.vue
+++ b/src/layout/newyjLayout.vue
@@ -115,17 +115,21 @@ export default {
             // location.href = process.env.NODE_ENV === "production"
             //   ? "/demo/suzhouyingjiPC/"
             //   : "/";
-            let isGovernmentAffairsNetwork = localStorage.getItem('isGovernmentAffairsNetwork')
-            if(process.env.NODE_ENV === "production") {
-              console.log('production')
-              if(isGovernmentAffairsNetwork == '1') {
-                console.log('进入跳转政务网的登录页')
-                location.href = process.env.VUE_APP_LOCATION + '/sso-server/oauth2/login?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
+            let isGovernmentAffairsNetwork = localStorage.getItem(
+              "isGovernmentAffairsNetwork"
+            );
+            if (process.env.NODE_ENV === "production") {
+              console.log("production");
+              if (isGovernmentAffairsNetwork == "1") {
+                console.log("进入跳转政务网的登录页");
+                location.href =
+                  process.env.VUE_APP_LOCATION +
+                  "/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code";
               } else {
-                location.href = "/login"
+                location.href = "/login";
               }
             } else {
-              location.href = "/"
+              location.href = "/";
             }
           });
         })
diff --git a/src/permission.js b/src/permission.js
index e56ba21..ccd3239 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,92 +1,109 @@
-import router from './router'
-import store from './store'
-import { Message } from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
-import { isRelogin } from '@/utils/request'
-import { getUseInfo } from '@/api/login.js'
+import router from "./router";
+import store from "./store";
+import { Message } from "element-ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getToken } from "@/utils/auth";
+import { isRelogin } from "@/utils/request";
+import { getUseInfo } from "@/api/login.js";
 
-NProgress.configure({ showSpinner: false })
+NProgress.configure({ showSpinner: false });
 
-const whiteList = ['/login', '/register']
+const whiteList = ["/login", "/register"];
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+    to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
+    if (to.path === "/login") {
+      next({ path: "/" });
+      NProgress.done();
     } else {
       // store.dispatch("Getdistrict");
       if (store.getters.roles.length === 0) {
-        isRelogin.show = true
+        isRelogin.show = true;
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then((res) => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            console.log(res);
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            //刷新之后,要去的路由肯定是自己已经保存过的新路由
-            let refresh = ''
-            if (store.state.user.new1.indexOf(to.path) != -1) {
-              refresh = to.path
-            }
-            console.log(to.path);
-            //进入添加的第一个路由
-            next({ path: refresh || res[0].path })
+        store
+          .dispatch("GetInfo")
+          .then((res) => {
+            isRelogin.show = false;
+            store.dispatch("GenerateRoutes").then((accessRoutes) => {
+              // 根据roles权限生成可访问的路由表
+              console.log(res);
+              router.addRoutes(accessRoutes); // 动态添加可访问路由表
+              //刷新之后,要去的路由肯定是自己已经保存过的新路由
+              let refresh = "";
+              if (store.state.user.new1.indexOf(to.path) != -1) {
+                refresh = to.path;
+              }
+              console.log(to.path);
+              //进入添加的第一个路由
+              next({ path: refresh || res[0].path });
+            });
           })
-        }).catch(err => {
-          store.dispatch('LogOut').then(() => {
-            Message.error(err)
-            next({ path: '/' })
-          })
-        })
+          .catch((err) => {
+            store.dispatch("LogOut").then(() => {
+              Message.error(err);
+              next({ path: "/" });
+            });
+          });
       } else {
-        if (store.state.user.old1.indexOf(to.path) != -1 && store.state.user.new1.indexOf(to.path) == -1) {
-          next({ path: '/404' })
+        if (
+          store.state.user.old1.indexOf(to.path) != -1 &&
+          store.state.user.new1.indexOf(to.path) == -1
+        ) {
+          next({ path: "/404" });
         } else {
-          next()
+          next();
         }
       }
     }
   } else {
     // 没有token
-    if(window.location.href.includes('?code')){
+    if (window.location.href.includes("?code")) {
       // console.log(window.location.href)
-      var reg = new RegExp(/[?&]code=([^&#]+)/)
-      var r = window.location.href.match(reg)
+      var reg = new RegExp(/[?&]code=([^&#]+)/);
+      var r = window.location.href.match(reg);
       // console.log('有code')
       // const code = window.location.href.split("?")[1].split('=')[1];
-      const code = r && r[1]
+      const code = r && r[1];
       // console.log(code)
-      getUseInfo({code:code}).then(user=>{
-        console.log(user,'用户信息')
-        localStorage.setItem('isGovernmentAffairsNetwork','1')
-        store.dispatch('LoginNoCaptcha',{username:'admin',password:'admin@123Jichuang'}).then((res) => {
-          next('/home')
+      getUseInfo({ code: code })
+        .then((user) => {
+          console.log(user, "用户信息");
+          localStorage.setItem("isGovernmentAffairsNetwork", "1");
+          store
+            .dispatch("LoginNoCaptcha", {
+              username: "admin",
+              password: "admin@123Jichuang",
+            })
+            .then((res) => {
+              next("/home");
+            });
         })
-      }).catch(err=>{
-        location.href = process.env.VUE_APP_LOCATION + '/sso-server/oauth2/login?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
-      })
+        .catch((err) => {
+          location.href =
+            process.env.VUE_APP_LOCATION +
+            "/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code";
+        });
     } else {
       // console.log('没code')
-      // location.href = process.env.VUE_APP_LOCATION + '/sso-server/oauth2/login?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F'
+      // location.href = process.env.VUE_APP_LOCATION + '/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F'
       if (whiteList.indexOf(to.path) !== -1) {
         // 在免登录白名单，直接进入
-        next()
-        NProgress.done()
+        next();
+        NProgress.done();
       } else {
-        location.href = process.env.VUE_APP_LOCATION + '/sso-server/oauth2/login?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
-        NProgress.done()
+        location.href =
+          process.env.VUE_APP_LOCATION +
+          "/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code";
+        NProgress.done();
       }
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});