diff --git a/README.md b/README.md index 61ec281f..ee3aa1de 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ 欢迎大家一起来参与开发,踊跃提交代码,交流QQ群:315181914 +- [在线演示](http://newadmin.it120.cc/) + - [后台接口文档](http://user.api.it120.cc/swagger-ui.html) - [vue-element-admin 演示](http://panjiachen.github.io/vue-element-admin) diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index a931c276..1c45f801 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -40,7 +40,6 @@ module.exports = { }, module: { rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, loader: 'vue-loader', diff --git a/src/store/index.js b/src/store/index.js index 6b6be08e..01be1b7a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,15 +1,13 @@ import Vue from 'vue' import Vuex from 'vuex' import app from './modules/app' -import user from './modules/user' import getters from './getters' Vue.use(Vuex) const store = new Vuex.Store({ modules: { - app, - user + app }, getters }) diff --git a/src/utils/request.js b/src/utils/request.js index 7051cb1c..3488f824 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,7 +1,6 @@ import axios from 'axios' import qs from 'qs' import { Message, MessageBox } from 'element-ui' -import store from '../store' import { getToken, removeToken } from '@/utils/auth' // 创建axios实例 @@ -12,9 +11,8 @@ const service = axios.create({ // request拦截器 service.interceptors.request.use(config => { - config.headers['X-Token'] = getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改 - //config.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'; - config.data = qs.stringify(config.data);//将对象解析成URL的形式 + config.headers['X-Token'] = getToken() + config.data = qs.stringify(config.data) return config }, error => { // Do something with request error