From 9dfbc038667839631578c12ff748534e5939bc82 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 02 九月 2025 14:34:23 +0800
Subject: [PATCH] 1.修复微信小程序canvans显示在最上层问题

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

diff --git a/common/request/fly.js b/common/request/fly.js
index e188721..8548e6d 100644
--- a/common/request/fly.js
+++ b/common/request/fly.js
@@ -1,13 +1,13 @@
 var Fly = require("./wx.umd.min")
-var fly = new Fly
+var fly = new Fly
+const log = false
 
 
 fly.config.loading = true;
 //瀹炰緥绾ч厤缃�
-//fly.config.timeout=6000;
+fly.config.timeout=10000;
 //娣诲姞鎷︽埅鍣�
 fly.interceptors.request.use((config, promise) => {
-	console.info(fly.config.loading)
 	if (fly.config.loading) {
 		uni.showLoading({
 			title: '鍔犺浇涓�'
@@ -15,18 +15,20 @@
 	}
 
 	//缁欐墍鏈夎姹傛坊鍔犺嚜瀹氫箟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;
-	} 
-	console.log('========================================== ')
-	console.log('==    璇锋眰鏁版嵁锛�' + JSON.stringify(config))
-	console.log('=========================================== ')
+	}
+	if(log){
+		console.log('========================================== ')
+		console.log('==    璇锋眰鏁版嵁锛�' + JSON.stringify(config))
+		console.log('=========================================== ')
+	}
 	return config;
 })
 
@@ -34,10 +36,12 @@
 fly.interceptors.response.use(
 	(response) => {
 
-		console.log('========================================')
-		console.log('==    鍝嶅簲鏁版嵁锛�' + JSON.stringify(response.request.url))
-		console.log('==    ' + JSON.stringify(response.data))
-		console.log('======================================== ')
+		if(log){
+			console.log('========================================')
+			console.log('==    鍝嶅簲鏁版嵁锛�' + JSON.stringify(response.request.url))
+			console.log('==    ' + JSON.stringify(response.data))
+			console.log('======================================== ')
+		}
 
 		//鍙皢璇锋眰缁撴灉鐨刣ata瀛楁杩斿洖
 
@@ -52,17 +56,23 @@
 		//鐧诲綍瓒呮椂锛岄噸鏂扮櫥褰�
 		if (err.response && err.response.status == 401) {
 			uni.showToast({
-				title:  "鐧诲綍鐘舵�佸凡澶辨晥锛岄噸鏂扮櫥褰�!",
+				title: "鐧诲綍鐘舵�佸凡澶辨晥锛岄噸鏂扮櫥褰�!",
 				icon: 'none',
 				mask: true,
-				 complete: function (res) {
-					 setTimeout(()=>{
-						jumpToLogin(); 
-					 },1000)
-				         
-				      },
+				complete: function(res) {
+					setTimeout(() => {
+						jumpToLogin();
+					}, 1000)
+
+				},
 			});
-			
+
+		} else {
+			uni.showToast({
+				title: '缃戠粶閿欒锛岃绋嶅悗閲嶈瘯~',
+				icon: 'none',
+				mask: true
+			});
 		}
 		//鍙戠敓缃戠粶閿欒鍚庝細璧板埌杩欓噷
 		//return Promise.resolve("ssss")
@@ -73,12 +83,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