From 3c738f4fe2762bba8087e5a22fc0dc06560eab0e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 08 Aug 2024 10:01:17 +0800
Subject: [PATCH] 三色任务与自查任务

---
 http/api.js |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/http/api.js b/http/api.js
index de859da..0237c45 100644
--- a/http/api.js
+++ b/http/api.js
@@ -26,6 +26,13 @@
 	}
 	if (accessToken) {
 		config.header['Blade-Auth'] = 'bearer ' + accessToken;
+		config.header['roleName'] = uni.getStorageSync("activeRole").roleAlias || "";
+		let activeRole = uni.getStorageSync("activeRole")
+		if (activeRole.roleAlias === 'inhabitant') {
+			config.header['communityCode'] = uni.getStorageSync("siteInfo").neiCode || ""
+		} else {
+			config.header['communityCode'] = uni.getStorageSync("siteInfo").id || ""
+		}
 	}
 	if (config.params.tenantId) {
 		config.header['Tenant-Id'] = config.params.tenantId;
@@ -67,15 +74,28 @@
 }, config => { // 可使用async await 做异步操作
 	return Promise.reject(config)
 })
+
+// uni.showLoading({
+// 	title:"加载中..."
+// })
+
 http.interceptors.response.use((response) => {
+
 	// 若有数据返回则通过
 	if (response.data.access_token || response.data.key) {
 		return response.data
 	}
-
 	// 服务端返回的状态码不等于200,则reject()
 	if (response.data.code) {
 		if (response.data.code !== 200) {
+			uni.showToast({
+				title: response.data.msg,
+				icon: 'none'
+			});
+			return Promise.reject(response);
+		}
+	} else {
+		if (response.data.error_code !== 200) {
 			uni.showToast({
 				title: response.data.msg,
 				icon: 'none'
@@ -86,7 +106,8 @@
 
 	//数据中台返回的数据结果
 	if (response.statusCode) {
-		if (response.statusCode !== 200) {
+		// uni.hideLoading()
+		if (response.statusCode >= 300) {
 			console.log(response.data.msg)
 			uni.showToast({
 				title: '系统繁忙,请稍后再试',
@@ -107,11 +128,15 @@
 		const currentPage = pages[pages.length - 1]
 		uni.setStorageSync("responIndex", 0)
 		uni.clearStorageSync()
+		// uni.redirectTo({
+		// 	url: `/pages/login/login-account?redirect=/${currentPage.route}`
+		// })
+
 
 		uni.showModal({
 			title: "提示",
 			content: "请登录",
-			showCancel: false,
+			// showCancel: false,
 			success: res => {
 				if (res.confirm) {
 					uni.redirectTo({
@@ -122,9 +147,11 @@
 				}
 			}
 		})
-
-
-
+	} else {
+		uni.showToast({
+			title: '系统繁忙,请稍后再试',
+			icon: 'none'
+		});
 	}
 	return Promise.reject(response)
 })

--
Gitblit v1.9.3