From d5eef829f2daf8bf021c9524e2c93312091ba58f Mon Sep 17 00:00:00 2001
From: zhugf <312353457@qq.com>
Date: 星期四, 23 三月 2023 11:58:21 +0800
Subject: [PATCH] 细节优化
---
common/request/fly.js | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/common/request/fly.js b/common/request/fly.js
index b31bcb3..e188721 100644
--- a/common/request/fly.js
+++ b/common/request/fly.js
@@ -15,10 +15,15 @@
}
//缁欐墍鏈夎姹傛坊鍔犺嚜瀹氫箟header
- let token = getApp().globalData.token
+ //let token = getApp().globalData.token
+ const token = uni.getStorageSync('token');
+ const userinfo = uni.getStorageSync('userinfo');
if (token) {
- config.headers["X-Access-Token"] = token;
- }
+ config.headers["X-Access-Token"] = token;
+
+ if(userinfo)
+ config.headers["X-Tenant-Id"] = userinfo.loginTenantId;
+ }
console.log('========================================== ')
console.log('== 璇锋眰鏁版嵁锛�' + JSON.stringify(config))
console.log('=========================================== ')
@@ -45,8 +50,19 @@
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)
+
+ },
+ });
+
}
//鍙戠敓缃戠粶閿欒鍚庝細璧板埌杩欓噷
//return Promise.resolve("ssss")
@@ -57,7 +73,10 @@
//璺宠浆鍒扮櫥褰曢〉
function jumpToLogin() {
- console.log('鍏抽棴鎵�鏈夐〉闈㈣烦杞埌login')
+ console.log('鍏抽棴鎵�鏈夐〉闈㈣烦杞埌login')
+ uni.reLaunch({
+ url: '/pages/login/login'
+ });
}
module.exports = {
--
Gitblit v1.9.3