|
@@ -29,7 +29,7 @@ fly.interceptors.request.use((request) => {
|
|
console.log('nullHeaderToken()')
|
|
console.log('nullHeaderToken()')
|
|
return request;
|
|
return request;
|
|
}
|
|
}
|
|
- fly.lock()
|
|
|
|
|
|
+ // fly.lock()
|
|
// 延迟发请求 等 getStorageSync 存储
|
|
// 延迟发请求 等 getStorageSync 存储
|
|
if(wx.getStorageSync('token')) {
|
|
if(wx.getStorageSync('token')) {
|
|
// 给所有请求添加自定义header
|
|
// 给所有请求添加自定义header
|
|
@@ -39,7 +39,7 @@ fly.interceptors.request.use((request) => {
|
|
'X-Tag': 'flyio',
|
|
'X-Tag': 'flyio',
|
|
'Authorization': `Bearer ${wx.getStorageSync('token')}`
|
|
'Authorization': `Bearer ${wx.getStorageSync('token')}`
|
|
})
|
|
})
|
|
- fly.unlock(); //解锁请求
|
|
|
|
|
|
+ // fly.unlock(); //解锁请求
|
|
return request;
|
|
return request;
|
|
} else if (request.headers.Authorization) {
|
|
} else if (request.headers.Authorization) {
|
|
// 给所有请求添加自定义header
|
|
// 给所有请求添加自定义header
|
|
@@ -48,7 +48,7 @@ fly.interceptors.request.use((request) => {
|
|
'content-type': 'application/json',
|
|
'content-type': 'application/json',
|
|
'X-Tag': 'flyio'
|
|
'X-Tag': 'flyio'
|
|
})
|
|
})
|
|
- fly.unlock(); //解锁请求
|
|
|
|
|
|
+ // fly.unlock(); //解锁请求
|
|
return request;
|
|
return request;
|
|
}
|
|
}
|
|
// else if(!wx.getStorageSync('token')&&app.getCurrentPages()=='pages/login/login') {
|
|
// else if(!wx.getStorageSync('token')&&app.getCurrentPages()=='pages/login/login') {
|
|
@@ -61,11 +61,7 @@ fly.interceptors.request.use((request) => {
|
|
// return request;
|
|
// return request;
|
|
// }
|
|
// }
|
|
else {
|
|
else {
|
|
- setTimeout(() => {
|
|
|
|
- wx.redirectTo({
|
|
|
|
- url: '../login/login'
|
|
|
|
- });
|
|
|
|
- }, 300)
|
|
|
|
|
|
+ console.log(app.getCurrentPages())
|
|
}
|
|
}
|
|
}, (error, promise) => {
|
|
}, (error, promise) => {
|
|
// Do something with request error
|
|
// Do something with request error
|
|
@@ -88,9 +84,9 @@ fly.interceptors.response.use(
|
|
} else if (err.status === 401) {
|
|
} else if (err.status === 401) {
|
|
msg = '用户未登录'
|
|
msg = '用户未登录'
|
|
wx.clearStorageSync('token')
|
|
wx.clearStorageSync('token')
|
|
- wx.redirectTo({
|
|
|
|
- url: '../login/login'
|
|
|
|
- });
|
|
|
|
|
|
+ // wx.navigateTo({
|
|
|
|
+ // url: 'pages/me/me'
|
|
|
|
+ // });
|
|
} else {
|
|
} else {
|
|
if (err.response.data.message) {
|
|
if (err.response.data.message) {
|
|
msg = err.response.data.message
|
|
msg = err.response.data.message
|