diff --git a/examples/App.vue b/examples/App.vue index 1e98589c..5844b409 100644 --- a/examples/App.vue +++ b/examples/App.vue @@ -22,11 +22,13 @@ import SliderNav from "./components/sliderNav"; import MainContent from "./components/mainContent"; import HeaderNav from "./components/headerNav"; +import {mapMutations, mapState} from "vuex"; export default { name: 'app', components: {HeaderNav, MainContent, SliderNav}, computed: { + ...mapState(['user']), serveName() { let names = { development: "村微产品库", @@ -42,20 +44,16 @@ export default { }, data() { return { - token: "", dialog: false, showTools: true, } }, methods: { - setToken() { - localStorage.setItem('ui-token', this.token) - this.$message.success("设置token成功!") - }, + ...mapMutations(['setToken']), getToken(params) { - this.token = params.access_token - this.setToken() + this.setToken([params.token_type, params.access_token].join(' ')) this.dialog = false + this.$message.success("登录成功,正在刷新页面...") location.reload() }, getUserInfo() { @@ -75,13 +73,9 @@ export default { }, }, created() { - this.token = localStorage.getItem("ui-token") - if (this.token) this.getUserInfo() + if (this.user.token) this.getUserInfo() wx = jWeixin }, - destroyed() { - this.token = "" - }, mounted() { document.title = this.serveName } diff --git a/examples/router/axios.js b/examples/router/axios.js index 09e31fa7..e66fbc61 100644 --- a/examples/router/axios.js +++ b/examples/router/axios.js @@ -7,7 +7,6 @@ let baseURLs = { oms: '/oms' } instance.defaults.baseURL = baseURLs[process.env.NODE_ENV] -instance.interceptors.request.eject(0); instance.interceptors.request.use(config => { if (config.url.startsWith("/node")) { config.baseURL = "/ns" @@ -20,9 +19,6 @@ instance.interceptors.request.use(config => { config.baseURL = "/omsapi" config.url = config.url.replace(/(app|auth|admin)\//, "") } - if (!config.withoutToken && localStorage.getItem("ui-token")) { - config.headers['Authorization'] = ["Bearer", localStorage.getItem("ui-token")].join(" ") - } return config }, error => Message.error(error)) export default instance diff --git a/examples/store/index.js b/examples/store/index.js index 98759587..fb58e995 100644 --- a/examples/store/index.js +++ b/examples/store/index.js @@ -8,7 +8,7 @@ Vue.use(Vuex) const user = { state: { info: {}, - ATime: '', + token: '', financeUser: {} }, mutations: { @@ -20,8 +20,8 @@ const user = { setUserInfo(state, userInfo) { state.info = userInfo }, - SET_TIME(state, pay) { - state.ATime = pay + setToken(state, token) { + state.token = token } } }