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