修复返回按钮不显示问题

master
许宏杰 6 months ago
parent 40fa838cf0
commit ca4fdf029f

@ -6,10 +6,7 @@ VUE_APP_FILE_HOST = "https://www.jichuanglanhai.com:88/api/"
# 二期接口 # 二期接口
VUE_APP_RUOYI ='https://www.jichuanglanhai.com:88' VUE_APP_RUOYI ='https://www.jichuanglanhai.com:88'
# IOS和安卓访问
VUE_APP_INTERFACE = "http://39.101.188.84:89"
# 图片前缀正式服务器
VUE_APP_IMGURL ='http://221.229.220.83:9028'
VUE_APP_VERSION = "3.2.8" VUE_APP_VERSION = "3.2.8"
VUE_APP_VERSION2 = "3.2.8" VUE_APP_VERSION2 = "3.2.8"

@ -18,12 +18,12 @@ import { refreshToken, isRefreshRequest } from '@/util/refresh.js'
// 实例化axios // 实例化axios
const request = axios.create({ const request = axios.create({
baseURL: process.env.VUE_APP_HOST, baseURL: process.env.VUE_APP_HOST,
timeout: 50000, timeout: 50000
}) })
// request--请求 拦截器 // request--请求 拦截器
request.interceptors.request.use( request.interceptors.request.use(
(config) => { config => {
if (config.url !== 'secret/token') { if (config.url !== 'secret/token') {
let token = localStorage.getItem('mudu_token') let token = localStorage.getItem('mudu_token')
let authToken = 'Bearer ' + token let authToken = 'Bearer ' + token
@ -36,7 +36,7 @@ request.interceptors.request.use(
let params = config.data let params = config.data
// debugger // debugger
const formData = new FormData() const formData = new FormData()
Object.keys(params).forEach((key) => { Object.keys(params).forEach(key => {
//参数为null或者'null'时候不传入后台 //参数为null或者'null'时候不传入后台
if (params[key] && params[key] !== 'null') if (params[key] && params[key] !== 'null')
formData.append(key, params[key]) formData.append(key, params[key])
@ -46,19 +46,19 @@ request.interceptors.request.use(
} }
return config return config
}, },
(error) => { error => {
Promise.reject(error) Promise.reject(error)
} }
) )
// response--响应 拦截器 // response--响应 拦截器
request.interceptors.response.use( request.interceptors.response.use(
async (response) => { async response => {
// 系统返回状态判断 // 系统返回状态判断
if (response.data.code === 500) { if (response.data.code === 500) {
Toast({ Toast({
message: response.data.message, message: response.data.message,
position: 'bottom', position: 'bottom'
}) })
// router.replace('/') // router.replace('/')
return Promise.reject(response.data) return Promise.reject(response.data)
@ -70,7 +70,7 @@ request.interceptors.response.use(
if (message.length === 0) message = '暂无数据' if (message.length === 0) message = '暂无数据'
Toast({ Toast({
message: message, message: message,
position: 'bottom', position: 'bottom'
}) })
} }
return Promise.reject(response.data) return Promise.reject(response.data)
@ -80,14 +80,14 @@ request.interceptors.response.use(
return response.data return response.data
} }
}, },
async (error) => { async error => {
let errorData = error.response let errorData = error.response
if (errorData.status === 401 && !isRefreshRequest(errorData.config)) { if (errorData.status === 401 && !isRefreshRequest(errorData.config)) {
const isSucceed = await refreshToken() const isSucceed = await refreshToken()
if (isSucceed) { if (isSucceed) {
//重新请求 //重新请求
// console.log('重新刷新') console.log('重新刷新')
errorData.config.headers.Authorization = errorData.config.headers.Authorization =
'Bearer ' + localStorage.getItem('mudu_token') //替换token 'Bearer ' + localStorage.getItem('mudu_token') //替换token
let result = await request.request(errorData.config) //重新请求 let result = await request.request(errorData.config) //重新请求
@ -95,13 +95,13 @@ request.interceptors.response.use(
} else { } else {
Toast({ Toast({
message: '刷新令牌失败', message: '刷新令牌失败',
position: 'bottom', position: 'bottom'
}) })
} }
} else { } else {
Toast({ Toast({
message: '网络异常,请检查网络情况', message: '网络异常,请检查网络情况',
position: 'bottom', position: 'bottom'
}) })
} }
return Promise.reject(error) return Promise.reject(error)

@ -6,8 +6,9 @@ export async function refreshToken() {
if (promise) { if (promise) {
return promise return promise
} }
promise = new Promise(async (resolve) => { promise = new Promise(async resolve => {
const loginFrom = encryptionLogin() const loginFrom = encryptionLogin()
console.log('重新换token', loginFrom)
let res = await api.login(loginFrom, { __isRefreshToken: true }) let res = await api.login(loginFrom, { __isRefreshToken: true })
localStorage.setItem('mudu_token', res.access_token) //存token localStorage.setItem('mudu_token', res.access_token) //存token
resolve(res.code === 200) resolve(res.code === 200)

@ -7,12 +7,10 @@
*/ */
module.exports = { module.exports = {
publicPath: '/demo/mudu-vx/', //APP打包 publicPath: '/demo/mudu-vx/', //APP打包
// publicPath: '/demo/mudu-app-ceshi/',
// publicPath: '/demo/mudu-app-zhengshi/',
devServer: { devServer: {
proxy: { proxy: {
'/api': { '/api': {
target: 'http://221.229.220.83:86', //代理接口 target: 'http://221.229.220.83:86', //代理接口
changeOrigin: true, changeOrigin: true,
pathRewrite: {} pathRewrite: {}
@ -32,6 +30,6 @@ module.exports = {
// changeOrigin: true, // changeOrigin: true,
// pathRewrite: {}, // pathRewrite: {},
// }, // },
}, }
}, }
} }

Loading…
Cancel
Save