From 7adea4dfb1d468510d8dc840a0502e384506e177 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 14 Nov 2023 17:52:50 +0800
Subject: [PATCH] 校园安全报事详情,新增我的任务、工作日志页面

---
 http/api.js |   50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/http/api.js b/http/api.js
index de859da..ec32f02 100644
--- a/http/api.js
+++ b/http/api.js
@@ -67,15 +67,27 @@
 }, 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,6 +98,7 @@
 
 	//数据中台返回的数据结果
 	if (response.statusCode) {
+		uni.hideLoading()
 		if (response.statusCode !== 200) {
 			console.log(response.data.msg)
 			uni.showToast({
@@ -107,21 +120,26 @@
 		const currentPage = pages[pages.length - 1]
 		uni.setStorageSync("responIndex", 0)
 		uni.clearStorageSync()
-
-		uni.showModal({
-			title: "提示",
-			content: "请登录",
-			showCancel: false,
-			success: res => {
-				if (res.confirm) {
-					uni.redirectTo({
-						url: `/pages/login/login-account?redirect=/${currentPage.route}`
-					})
-				} else if (res.cancel) {
-					console.log('用户点击取消');
-				}
-			}
-		})
+        
+        uni.redirectTo({
+        	url: `/pages/login/login-account?redirect=/${currentPage.route}`
+        })
+		
+		 
+		// uni.showModal({
+		// 	title: "提示",
+		// 	content: "请登录",
+		// 	showCancel: false,
+		// 	success: res => {
+		// 		if (res.confirm) {
+		// 			uni.redirectTo({
+		// 				url: `/pages/login/login-account?redirect=/${currentPage.route}`
+		// 			})
+		// 		} else if (res.cancel) {
+		// 			console.log('用户点击取消');
+		// 		}
+		// 	}
+		// })
 
 
 

--
Gitblit v1.9.3