Commit 34a03c69 authored by yyh's avatar yyh

代码调整

parent cc8b88d9
import Vue from 'vue';
import { importAll } from '@/utils/utils'; import { importAll } from '@/utils/utils';
const components = importAll(require.context('./', true, /\.vue$/ )); const components = importAll(require.context('./', true, /\.vue$/ ));
Object.keys(components).forEach(key => { export default {
Vue.component(key, components[key]); install(Vue: any) {
}); Object.keys(components).forEach(key => {
Vue.component(key, components[key]);
});
},
};
...@@ -5,7 +5,8 @@ import store from './store'; ...@@ -5,7 +5,8 @@ import store from './store';
import api from './api'; import api from './api';
Vue.prototype.$api = api; Vue.prototype.$api = api;
import '@/components'; import components from '@/components';
Vue.use(components);
import '@/filter'; import '@/filter';
import VueClipboard from 'vue-clipboard2'; import VueClipboard from 'vue-clipboard2';
......
...@@ -101,9 +101,11 @@ instance.interceptors.request.use( ...@@ -101,9 +101,11 @@ instance.interceptors.request.use(
config.cancelToken = new CancelToken((c) => { config.cancelToken = new CancelToken((c) => {
removePendingAjax(config, c); removePendingAjax(config, c);
}); });
let userInfo = localStorage.getItem('userInfo'); let userInfo: any = localStorage.getItem('userInfo');
userInfo = userInfo ? JSON.parse(userInfo) : {}; if (userInfo) {
config.headers.Authorization = (userInfo as any ).token || ''; userInfo = JSON.parse(userInfo);
config.headers.Authorization = userInfo?.token;
}
return config; return config;
}, },
(error: any) => Promise.reject(error)); (error: any) => Promise.reject(error));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment