From 458962a2e4a4f6af0caa5fcb3867f2e42125fd40 Mon Sep 17 00:00:00 2001
From: 朱桂飞 <18597012158>
Date: 星期一, 03 四月 2023 08:29:21 +0800
Subject: [PATCH] 修改字体大小,导航栏字体颜色

---
 common/request/fly.js |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/common/request/fly.js b/common/request/fly.js
index 10a84c4..68d4550 100644
--- a/common/request/fly.js
+++ b/common/request/fly.js
@@ -15,16 +15,14 @@
 	}
 
 	//缁欐墍鏈夎姹傛坊鍔犺嚜瀹氫箟header
-	//let token = getApp().globalData.token
-	const token =  uni.getStorageSync('token');
-	const userinfo =  uni.getStorageSync('userinfo');
+	//let token = getApp().globalData.token
+	const token = uni.getStorageSync('token');
+	const userinfo = uni.getStorageSync('userinfo');
 	if (token) {
-		config.headers["X-Access-Token"] = token;
-		
-		if(userinfo)
+		config.headers["X-Access-Token"] = token;
+	}
+	if (userinfo) {
 		config.headers["X-Tenant-Id"] = userinfo.loginTenantId;
-	}else{
-		jumpToLogin();
 	}
 	console.log('========================================== ')
 	console.log('==    璇锋眰鏁版嵁锛�' + JSON.stringify(config))
@@ -52,8 +50,25 @@
 		console.info(err)
 		uni.hideLoading()
 		//鐧诲綍瓒呮椂锛岄噸鏂扮櫥褰�
-		if (err.response.status == 401) {
-			jumpToLogin();
+		if (err.response && err.response.status == 401) {
+			uni.showToast({
+				title: "鐧诲綍鐘舵�佸凡澶辨晥锛岄噸鏂扮櫥褰�!",
+				icon: 'none',
+				mask: true,
+				complete: function(res) {
+					setTimeout(() => {
+						jumpToLogin();
+					}, 1000)
+
+				},
+			});
+
+		} else {
+			uni.showToast({
+				title: '缃戠粶閿欒锛岃绋嶅悗閲嶈瘯~',
+				icon: 'none',
+				mask: true
+			});
 		}
 		//鍙戠敓缃戠粶閿欒鍚庝細璧板埌杩欓噷
 		//return Promise.resolve("ssss")
@@ -64,12 +79,12 @@
 
 //璺宠浆鍒扮櫥褰曢〉
 function jumpToLogin() {
-	console.log('鍏抽棴鎵�鏈夐〉闈㈣烦杞埌login')
-	uni.reLaunch({
-		url: '/pages/login/login'
+	console.log('鍏抽棴鎵�鏈夐〉闈㈣烦杞埌login')
+	uni.reLaunch({
+		url: '/pages/login/login'
 	});
 }
 
 module.exports = {
 	fly
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3