|
@@ -48,33 +48,33 @@ const request = (opts, hasToken) => {
|
|
|
}else{
|
|
|
if(ret.status == '401'){ // 未登录或登录过期
|
|
|
// 除过查询未完成订单的请求
|
|
|
- if(opts.url.indexOf("order/unFinishedOrderRunStatus")<0){
|
|
|
+ // if(opts.url.indexOf("order/unFinishedOrderRunStatus")<0){
|
|
|
uni.showToast({
|
|
|
icon:'none',
|
|
|
title: '未登录或登录已过期,请重新登录',
|
|
|
duration: 5000
|
|
|
})
|
|
|
setTimeout(function() {
|
|
|
- const currentRoute = getRoutePath();
|
|
|
- const url = `/pages/login/pwLogin?lanuch=${currentRoute.lanuch}&path=` + encodeURIComponent(currentRoute.url);
|
|
|
- uni.redirectTo({ url });
|
|
|
- }, 1000);
|
|
|
- }
|
|
|
+ const currentRoute = getRoutePath();
|
|
|
+ const url = `/pages/login/login`
|
|
|
+ uni.redirectTo({ url })
|
|
|
+ }, 1000)
|
|
|
+ // }
|
|
|
}
|
|
|
else{
|
|
|
console.log(opts.url,'opts.url')
|
|
|
if(ret.status == 500){
|
|
|
- if(
|
|
|
- opts.url.indexOf("store/validateStoreAndDevice")<0&&
|
|
|
- opts.url.indexOf("couponReceives/findUsableCoupon")<0&&
|
|
|
- opts.url.indexOf("shelfReplenish/detail/queryByProductQrCode")<0){
|
|
|
+ // if(
|
|
|
+ // opts.url.indexOf("store/validateStoreAndDevice")<0&&
|
|
|
+ // opts.url.indexOf("couponReceives/findUsableCoupon")<0&&
|
|
|
+ // opts.url.indexOf("shelfReplenish/detail/queryByProductQrCode")<0){
|
|
|
uni.showToast({
|
|
|
icon:'none',
|
|
|
title: ret.message,
|
|
|
mask: true,
|
|
|
duration: 3000
|
|
|
})
|
|
|
- }
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
resolve(ret)
|