Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

http/yskApi/http.js

@@ -15,6 +15,7 @@ import {
 } from '@/commons/utils/encryptUtil.js'
 import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
+import { reject } from 'lodash';
 // 测试服
 let baseUrl = 'https://admintestpapi.sxczgkj.cn'
 
@@ -127,8 +128,9 @@ function commonsProcess(showLoading, httpReqCallback) {
 	}).catch(res => {
 		if(res.status==401){
 			storageManage.token(null, true)
-			infoBox.showErrorToast('请登录').then(() => {
-				go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+			infoBox.showErrorToast(res.message||'请登录').then(() => {
+				uni.redirectTo({url: '/pages/login/index'})
+				reject()
 			})
 		}
 		// if(res.status==400){
@@ -138,9 +140,7 @@ function commonsProcess(showLoading, httpReqCallback) {
 		// 	})
 		// }
 		if(res.status==500){
-			storageManage.token(null, true)
-			infoBox.showErrorToast('请登录').then(() => {
-				go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+			infoBox.showErrorToast(res.message||'服务器异常').then(() => {
 			})
 		}
 		// if(res&&res.msg){