diff --git a/utils/request.js b/utils/request.js
index 027945d7..4e0b3546 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -3,6 +3,9 @@ import {
 	refreshTokenFn
 } from "@/api/login.js";
 import storage from "@/utils/storage.js";
+import {
+	logout
+} from '@/api/login';
 import {
 	md5
 } from "@/utils/md5.js";
@@ -146,7 +149,7 @@ http.interceptors.response.use(
 			// }
 
 			let token = storage.getAccessToken();
-			
+
 			if (
 				(token && response.statusCode === 403) ||
 				(token && response.data.status === 403)
@@ -205,30 +208,6 @@ http.interceptors.response.use(
 				(response.statusCode == 200 && !response.data.success) ||
 				response.statusCode == 400
 			) {
-<<<<<<< Updated upstream
-				if (response.data.code == 408) {
-					uni.showModal({
-						title: '提示',
-						content: response.data.message,
-						showCancel: false,
-						success() {
-							logout().then(() => {
-								cleanStorage();
-							});
-						}
-					})
-					uni.showToast({
-						title: response.data.message,
-						icon: "none",
-						duration: 1500,
-					});
-				} else {
-					uni.showToast({
-						title: response.data.message,
-						icon: "none",
-						duration: 1500,
-					});
-=======
 				if (response.data.message) {
 					if (response.data.code == 408) {
 						uni.showModal({
@@ -252,7 +231,6 @@ http.interceptors.response.use(
 						});
 					}
 
->>>>>>> Stashed changes
 				}
 			} else if (response.data.code == 502) {
 				cleanStorage();