|
@@ -27,9 +27,16 @@ const request = (opts, hasToken) => {
|
|
let promise = new Promise(function(resolve, reject) {
|
|
let promise = new Promise(function(resolve, reject) {
|
|
uni.request(DefaultOpts).then(
|
|
uni.request(DefaultOpts).then(
|
|
(res) => {
|
|
(res) => {
|
|
|
|
+ console.log(res)
|
|
// 是否超时已跳转
|
|
// 是否超时已跳转
|
|
let loginTimeOut = uni.getStorageSync('loginTimeOut');
|
|
let loginTimeOut = uni.getStorageSync('loginTimeOut');
|
|
if(res[0]&&res[0].errMsg.indexOf('request:fail')>=0){
|
|
if(res[0]&&res[0].errMsg.indexOf('request:fail')>=0){
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon:'none',
|
|
|
|
+ title: '网络请求失败,请检查网络连接情况',
|
|
|
|
+ mask: true,
|
|
|
|
+ duration: 4000
|
|
|
|
+ })
|
|
resolve({
|
|
resolve({
|
|
status: 6000,
|
|
status: 6000,
|
|
message: "网络请求失败"
|
|
message: "网络请求失败"
|
|
@@ -48,19 +55,16 @@ const request = (opts, hasToken) => {
|
|
resolve(ret)
|
|
resolve(ret)
|
|
}else{
|
|
}else{
|
|
if(ret.status == '401' || ret.status == '1099'){ // 未登录或登录过期
|
|
if(ret.status == '401' || ret.status == '1099'){ // 未登录或登录过期
|
|
- // 除过查询未完成订单的请求
|
|
|
|
- // if(opts.url.indexOf("order/unFinishedOrderRunStatus")<0){
|
|
|
|
- uni.showToast({
|
|
|
|
- icon:'none',
|
|
|
|
- title: '未登录或登录已过期,请重新登录',
|
|
|
|
- duration: 5000
|
|
|
|
- })
|
|
|
|
- setTimeout(function() {
|
|
|
|
- const currentRoute = getRoutePath();
|
|
|
|
- const url = `/pages/login/login`
|
|
|
|
- uni.redirectTo({ url })
|
|
|
|
- }, 1000)
|
|
|
|
- // }
|
|
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon:'none',
|
|
|
|
+ title: '未登录或登录已过期,请重新登录',
|
|
|
|
+ duration: 5000
|
|
|
|
+ })
|
|
|
|
+ setTimeout(function() {
|
|
|
|
+ const currentRoute = getRoutePath();
|
|
|
|
+ const url = `/pages/login/login`
|
|
|
|
+ uni.redirectTo({ url })
|
|
|
|
+ }, 1000)
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
console.log(opts.url,'opts.url')
|
|
console.log(opts.url,'opts.url')
|
|
@@ -73,7 +77,7 @@ const request = (opts, hasToken) => {
|
|
icon:'none',
|
|
icon:'none',
|
|
title: ret.message,
|
|
title: ret.message,
|
|
mask: true,
|
|
mask: true,
|
|
- duration: 3000
|
|
|
|
|
|
+ duration: 4000
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|