diff --git a/src/api/api.js b/src/api/api.js index a31c6d4..79a12d0 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,20 +2,20 @@ import request from '@/api/request' import mm from "@/utlis/mm"; - export function getapi(url, params = {}, config) { - return new Promise((resolve, reject) => { - request.get(`${mm.apiurl}${url}`, { - params: params, - ...config - }).then(res => { - resolve(res) - }).catch(err => { - reject(err.data) - }) +export function getapi(url, params = {}, config) { + return new Promise((resolve, reject) => { + request.get(`${mm.apiurl}${url}`, { + params: params, + ...config + }).then(res => { + resolve(res) + }).catch(err => { + reject(err.data) }) - } - - //axios封装post + }) +} + +//axios封装post export function postapi(url, paramsdata = {}, config) { return new Promise((resolve, reject) => { request.post(`${mm.apiurl}${url}`, paramsdata, config).then(res => { diff --git a/src/api/request.js b/src/api/request.js index 68da5f5..27006c2 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -2,19 +2,17 @@ import router from "@/router" import axios from "axios" // import Promise from 'promise' -import {yztoken} from "@/utlis/istoken" +import { yztoken } from "@/utlis/istoken" import mm from "@/utlis/mm"; - import { Message } from 'element-ui'; const instance = axios.create({ baseURL: mm.apiurl, - timeout:5000 + timeout: 5000 }); - + //请求拦截 instance.interceptors.request.use( - function (config) { yztoken() let token = localStorage.getItem('token') @@ -29,15 +27,15 @@ instance.interceptors.request.use( return Promise.reject(err) } ) - + //响应拦截 -instance.interceptors.response.use( +instance.interceptors.response.use( (res) => { //console.log(res); if (res.data.code == 1) { - // const { data } = res; - console.log(9527); - console.log(res); + // const { data } = res; + console.log(9527); + console.log(res); return res.data } else if (res.Code == -1) { // console.log(res.data.message); @@ -49,15 +47,15 @@ instance.interceptors.response.use( } }, (err) => { - console.log(err); - if (response.data.code == -1) { - router.push({ path: '/login' }) - // this.$router.push({path:'/login'}) - // this.$message.success('状态失效') - Message.error('状态失效请重新登录') - console.log('token失效返回登录'); - } - console.log(err); + // console.log(err); + // if (response.data.code == -1) { + // router.push({ path: '/login' }) + // // this.$router.push({path:'/login'}) + // // this.$message.success('状态失效') + // Message.error('状态失效请重新登录') + // console.log('token失效返回登录'); + // } + // console.log(err); return Promise.reject(err) } // function (response) { diff --git a/src/router/index.js b/src/router/index.js index 74fae8f..109f92a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -153,7 +153,17 @@ const routes = [ }, { path: '/diagnosis', - component: () => import('../views/fee-settings/Diagnosis.vue') + component: () => import('../views/fee-settings/Diagnosis.vue'), + hidden: true, + // meta: { + // title: '诊断', + // menu + // } + meat: { + title: '诊断', + noCache: true, + menus: ['diagosis:advertDemandRelease'] + } }, { path: '/item-result-template', diff --git a/src/utlis/istoken.js b/src/utlis/istoken.js index 0a03d1f..c64fcb9 100644 --- a/src/utlis/istoken.js +++ b/src/utlis/istoken.js @@ -2,41 +2,38 @@ import moment from "moment"; import axios from "axios"; import mm from "@/utlis/mm"; -export const yztoken=()=>{ - console.log('验证') - - let dqtime=parseInt(new Date().getTime()/1000); // 当前时间的时间戳 - let tokentime=parseInt(window.localStorage.getItem("expires_in")) ; //登录缓存后的时间戳 - if(dqtime>tokentime-10) - { - console.log('重新拉取') - //少于300秒 重新拉取 - axios.post( - mm.apiurl+"/connect/token", - { - client_id: "Peis_App", - grant_type: "refresh_token", - refresh_token: window.localStorage.getItem("refresh_token") - }, - { - headers: { - "Content-Type": "application/x-www-form-urlencoded", - }, - } - ) - .then((res) => { - writetoken(res.data.expires_in) - window.localStorage.setItem("token", res.data.access_token); - window.localStorage.setItem("refresh_token", res.data.refresh_token); - }); - } +export const yztoken = () => { + console.log('验证') + let dqtime = parseInt(new Date().getTime() / 1000); // 当前时间的时间戳 + let tokentime = parseInt(window.localStorage.getItem("expires_in")); //登录缓存后的时间戳 + if (dqtime > tokentime - 10) { + console.log('重新拉取') + //少于300秒 重新拉取 + axios.post( + mm.apiurl + "/connect/token", + { + client_id: "Peis_App", + grant_type: "refresh_token", + refresh_token: window.localStorage.getItem("refresh_token") + }, + { + headers: { + "Content-Type": "application/x-www-form-urlencoded", + }, + } + ) + .then((res) => { + writetoken(res.data.expires_in) + window.localStorage.setItem("token", res.data.access_token); + window.localStorage.setItem("refresh_token", res.data.refresh_token); + }); + } } - -export const writetoken=(addtime)=>{ - let date = moment(); - date.add(addtime, 's'); - let lasttime=parseInt(new Date(date).getTime() / 1000) - console.log(lasttime) - window.localStorage.setItem("expires_in", lasttime); //写入计算过的时间戳 +export const writetoken = (addtime) => { + let date = moment(); + date.add(addtime, 's'); + let lasttime = parseInt(new Date(date).getTime() / 1000) + console.log(lasttime) + window.localStorage.setItem("expires_in", lasttime); //写入计算过的时间戳 } \ No newline at end of file diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue index f918d5c..da68daa 100644 --- a/src/views/fee-settings/Item.vue +++ b/src/views/fee-settings/Item.vue @@ -52,7 +52,7 @@
+