module-menu-vue 0.0.32 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu-vue",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "城市大数据平台菜单--Vue版",
   "main": "/index.js",
   "scripts": {

package/src/components/User/UserInfo.vue

@@ -27,8 +27,8 @@
 
 <script >
 import {userMenuIcon} from './constant.js'
-// import { logout } from '../Util/permessionUtils'
-import Axios from '../Util/axios'
+import axios from 'axios';
+import '../Util/axios.js'
 export default {
     name: 'UserInfo',
     data () {
@@ -60,12 +60,22 @@ export default {
         },
         logoutFunc () {
             console.log('开始调用退出接口...')
-            Axios('delete', '/auth/token/logout', '', {}).then(res => {
+            let httpDefult = {};
+            // 退出登录
+            httpDefult = {
+                method: 'delete',
+                url: '/auth/token/logout',
+            };
+            axios(httpDefult)
+                .then((res) => {
                 console.log('res: ', res)
-                this.$router.push({ path: "/login" });
-            }).catch((err) => {
-                console.error('err:', err)
-            })
+                    localStorage.clear();
+                    sessionStorage.clear();
+                    location.href = '/#/login';
+                })
+                .catch((err) => {
+                    console.log('err: ', err)
+                });
         },
         getUserName ()  {
             const userInfo = JSON.parse(sessionStorage.getItem('bigdata-userInfo')||"{}");

package/src/components/Util/axios.js

@@ -1,8 +1,6 @@
 import axios from 'axios';
-import baseCof from './config';
-import getStore from './userInfo';
-import { checkToken} from './permessionUtils';
-
+import { getStore } from './userInfo.js';
+import { checkToken } from './permessionUtils';
 let tokenValue = '574536b1-5832-417b-b909-82e204679d67';
 
 axios.interceptors.response.use(
@@ -34,7 +32,7 @@ axios.interceptors.response.use(
       }
     }
     console.log('=========', JSON.stringify(error.response))
-    return Promise.reject(error.response.data);
+    return Promise.reject(error.response);
   },
 );
 
@@ -71,30 +69,4 @@ axios.interceptors.request.use(
     // 对请求错误做些什么
     return Promise.reject(error);
   },
-);
-
-function Axios(method, api, params, map) {
-  let httpDefult = {};
-  // 退出登录
-  httpDefult = {
-    method: method,
-    url: `${baseCof.baseSever}${api}`,
-    params: params,
-    ...map
-  };
-  console.log('httpDefult', JSON.stringify(httpDefult))
-
-  return new Promise((resolve, reject) => {
-    axios(httpDefult)
-      .then((res) => {
-        console.log('res', res)
-        resolve(res);
-      })
-      .catch((err) => {
-        console.log('err', err)
-        reject(err);
-      });
-  })
-}
-
-export default Axios;
+);