From 2ef590774e2d655cdc43ee2c6fa4c674ac4d882d Mon Sep 17 00:00:00 2001 From: kimi <kimi42345@gmail.com> Date: 星期三, 12 二月 2020 10:30:13 +0800 Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs --- src/main.ts | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/main.ts b/src/main.ts index b3db049..284709a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,21 +1,58 @@ import Vue from "vue"; import App from "./App.vue"; -import axios from 'axios' import "./registerServiceWorker"; import router from "./router"; import store from "./store"; import ElementUI from "element-ui"; import "element-ui/lib/theme-chalk/index.css"; +import Axios from 'axios'; +//npm i moment --save +import moment from 'moment'; +import echarts from 'echarts' + +Vue.prototype.$echarts = echarts Vue.use(ElementUI); - +Vue.prototype.$moment = moment;//璧嬪�间娇鐢� + Vue.config.productionTip = false; +Vue.prototype.$axios = Axios; +Axios.defaults.baseURL = '/api'; +Axios.defaults.headers.post['Content-Type'] = 'application/json'; -Vue.prototype.axios = axios; +/* Axios.interceptors.request.use( + config => { + let userId_ = localStorage.getItem('userId'); + if (!userId_) { // + router.replace({ + path: 'login', + + }) + } + return config; + }, + err => { + return Promise.reject(err); + }); */ + new Vue({ router, store, render: h => h(App) }).$mount("#app"); + + +Axios.interceptors.request.use(function (config) { + let userId_ = localStorage.getItem('userId'); + if (!userId_ && config.url != "/api/user/login") { + router.replace('/login'); + } + config.headers.common['userId'] = userId_; + return config; +}, function (error) { + console.info("error: "); + console.info(error); + return Promise.reject(error); +}); \ No newline at end of file -- Gitblit v1.8.0