zhaoke пре 1 година
родитељ
комит
af11d3bb3b
3 измењених фајлова са 6 додато и 5 уклоњено
  1. 2 2
      src/getMenu.js
  2. 2 2
      src/store/modules/user.js
  3. 2 1
      src/views/login/index.vue

+ 2 - 2
src/getMenu.js

@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken } from '@/utils/auth' // get token from cookie
+import { getCodeToken } from '@/utils/auth' // get token from cookie
 import getPageTitle from '@/utils/get-page-title'
 import Layout from '@/layout'
 import { setTree, listToTree } from '@/utils/validate'
@@ -36,7 +36,7 @@ router.beforeEach(async (to, from, next) => {
   document.title = getPageTitle(to.meta.title)
 
   // determine whether the user has logged in
-  const hasToken = getToken()
+  const hasToken = getCodeToken()
   if (hasToken) {
     if (to.path === '/login') {
       // if is logged in, redirect to the home page

+ 2 - 2
src/store/modules/user.js

@@ -1,11 +1,11 @@
-import { getToken, setToken, removeToken, setUserId, TokenKey } from '@/utils/auth'
+import { getCodeToken, setToken, removeToken, setUserId, TokenKey } from '@/utils/auth'
 import { resetRouter } from '@/router'
 import { Query } from "@/api/webApi"
 import { isValue } from "@/utils/validate"
 import { getAuth, signIn, loginOut, getPermissions } from '@/api/login'
 const getDefaultState = () => {
   return {
-    token: getToken(TokenKey),
+    token: getCodeToken(),
     name: '',
     avatar: '',
     isLogin: false,

+ 2 - 1
src/views/login/index.vue

@@ -34,7 +34,7 @@
 <script>
 import { isValue } from "@/utils/validate";
 import { getVCode, getToken, getKey, forceLogin } from "@/api/login";
-import { setToken, TokenKey, getUserId, removeToken } from '@/utils/auth';
+import { setToken, TokenKey, getUserId, setCodeToken } from '@/utils/auth';
 import MD5 from 'blueimp-md5'
 import JSEncrypt from "jsencrypt";
 const defaultBgImg = require('@/assets/loginpage/bg.jpg')
@@ -175,6 +175,7 @@ export default {
       });
       if (code == 0 && isValue(returnData)) {
         setToken('usertoken', returnData.usertoken)
+        setCodeToken(returnData.usertoken)
         this.$store.dispatch("app/toggleOutcheck", false);
         sessionStorage.setItem("userName", this.loginForm.username.replace(/\s+/g, ""));
         this.$router.push({ path: this.redirect || "/" });