diff --git a/src/api/api.js b/src/api/api.js
index 0f808f3..4e5aeb5 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1,5 +1,7 @@
import axios from 'axios';
import router from '../router';
+import store from '@/store'
+import util from '@/libs/util'
const url = location.host
const dev = process.env.NODE_ENV === 'development' // 开发环境
@@ -7,101 +9,105 @@ let host = `${location.origin}/`
if (dev) {
// 本地
host = 'http://121.37.12.51/' // 中台测试服
- // host = 'https://www.occupationlab.com/' // 正式服
+ // host = 'https://www.occupationlab.com/' // 正式服
// host = 'http://192.168.31.151:9000/' // 榕
// host = 'http://192.168.31.116:9000/' // 赓
}
// 创建axios实例
const service = axios.create({
- baseURL: host, // 测试
- timeout: 30000 // 请求超时时间
+ baseURL: host, // 测试
+ timeout: 30000 // 请求超时时间
})
// 添加request拦截器
service.interceptors.request.use(config => {
- return config
+ return config
}, error => {
- Promise.reject(error)
+ Promise.reject(error)
})
// 添加respone拦截器
service.interceptors.response.use(
- response => {
- let res={};
- res.status=response.status
- res.data=response.data;
- return res;
- },
- error => {
- if(error.response && error.response.status == 404){
- router.push('/blank.vue')
- }
- return Promise.reject(error.response)
+ response => {
+ let res = {};
+ res.status = response.status
+ res.data = response.data;
+ return res;
+ },
+ error => {
+ if (error.response.status == 401) {
+ console.log("🚀 ~ error:", error.response.status, store.commit('user/logout'))
+ util.errorMsg('登录过期，请重新登录')
+ setTimeout(() => {
+ store.commit('user/logout')
+ }, 1500)
}
+ return Promise.reject(error.response)
+ }
)
let tokens
let token
-var reg = new RegExp('(^|&)'+'token'+'=([^&]*)(&|$)')
-if(window.location.href.split('?')[1]){
- var r = window.location.href.split('?')[1].match(reg)
- if (r != null){
- tokens = (r[2])
- }else{
- tokens = null
- }
+var reg = new RegExp('(^|&)' + 'token' + '=([^&]*)(&|$)')
+if (window.location.href.split('?')[1]) {
+ var r = window.location.href.split('?')[1].match(reg)
+ if (r != null) {
+ tokens = (r[2])
+ } else {
+ tokens = null
+ }
}
-if(tokens){
- token = tokens
-}else{
- token = sessionStorage.getItem('token')
+if (tokens) {
+ token = tokens
+} else {
+ token = sessionStorage.getItem('token')
}
-export function get(url, params = {}) {
- // params.t = new Date().getTime(); //get方法加一个时间参数,解决ie下可能缓存问题.
- return service({
- url: url,
- method: 'get',
- headers: {
- token:token
- },
- params
- })
+export function get (url, params = {}) {
+ // params.t = new Date().getTime(); //get方法加一个时间参数,解决ie下可能缓存问题.
+ return service({
+ url: url,
+ method: 'get',
+ headers: {
+ token: token
+ },
+ params
+ })
}
//封装post请求
-export function post(url, data = {}) {
- //默认配置
- let sendObject={
- url: url,
- method: 'post',
- headers: {
- 'Content-Type':'application/json;charset=UTF-8',
- token:token
- },
- data:data
- };
- sendObject.data=JSON.stringify(data);
- return service(sendObject)
+export function post (url, data = {}) {
+ //默认配置
+ let sendObject = {
+ url: url,
+ method: 'post',
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8',
+ token: token
+ },
+ data: data
+ };
+ sendObject.data = JSON.stringify(data);
+ return service(sendObject)
}
//封装put方法 (resfulAPI常用)
-export function put(url,data = {}){
- return service({
- url: url,
- method: 'put',
- headers: {
- 'Content-Type':'application/json;charset=UTF-8',
- token:token
- },
- data:JSON.stringify(data)
- })
+export function put (url, data = {}) {
+ return service({
+ url: url,
+ method: 'put',
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8',
+ token: token
+ },
+ data: JSON.stringify(data)
+ })
}
//删除方法(resfulAPI常用)
-export function deletes(url){
- return service({
- url: url,
- method: 'delete',
- headers: {
- token:token
- }
- })
+export function deletes (url) {
+ return service({
+ url: url,
+ method: 'delete',
+ headers: {
+ token: token
+ }
+ })
}
//不要忘记export
export {
- service
+ service
}
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 54b1b9c..f8701aa 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -11,7 +11,7 @@
+ @click="logout">
退出
@@ -19,7 +19,7 @@
diff --git a/src/pages/manage/list/agent/electricRate.vue b/src/pages/manage/list/agent/electricRate.vue
index 1605f34..ba32b45 100644
--- a/src/pages/manage/list/agent/electricRate.vue
+++ b/src/pages/manage/list/agent/electricRate.vue
@@ -77,7 +77,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
提交
-
-
-
+
+
+
提交
基本信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 基本信息
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ v-model="form.customerName"
+ @input="(val) => checkName(val, form, 'customerName')">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
- 收入信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 收入信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 房产信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 房产信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 贷款合同
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 贷款合同
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -246,15 +237,18 @@
:formName="formName"
@submitIt="submitForm2"
depositNumber='0816' />
- 下一步
+
+
+ {{ curStep === 1 ? '下一步' : '提交' }}
+