From 91ecc48fdd7a3407875d5068c1dfc6f63497be6f Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Feb 2025 09:47:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sheep/utils/request.ts | 50 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index ce9ed7e..37c1547 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -99,6 +99,31 @@ const responseHelpers = {
 			case 401:
 				this.handleUnauthorized()
 				break
+			case 424:
+				try {
+					const params = new URL(window.location.href).searchParams
+					const token = params.get("uabaseToken")
+					if (token) {
+						userApi.auth(token).then((res) => {
+							if (res?.code === 0) {
+								uni.setStorageSync(TOKEN_KEY, res.data)
+							} else {
+								uni.removeStorageSync(TOKEN_KEY)
+								uni.removeStorageSync(USER_INFO_KEY)
+								// uni.showToast({ title: "登录已过期", icon: "none" })
+								return Promise.resolve({
+									code: 1,
+									data: "登录已过期",
+									msg: "登录已过期",
+								})
+							}
+						})
+					}
+				} catch (error) {
+					uni.hideLoading()
+					uni.showToast({ title: "错误", icon: "none" })
+				}
+				break
 			default:
 				uni.showToast({
 					title: response.data.msg || "服务器开小差啦,请稍后再试~",
@@ -248,6 +273,30 @@ http.interceptors.response.use(
 				uni.showToast({ title: "登录已过期，请重新登录", icon: "none" })
 				router.jump("/pages/test/login")
 				return false
+			} else {
+				try {
+					const params = new URL(window.location.href).searchParams
+					const token = params.get("uabaseToken")
+					if (token) {
+						userApi.auth(token).then((res) => {
+							if (res?.code === 0) {
+								uni.setStorageSync(TOKEN_KEY, res.data)
+							} else {
+								uni.removeStorageSync(TOKEN_KEY)
+								uni.removeStorageSync(USER_INFO_KEY)
+								// uni.showToast({ title: "登录已过期", icon: "none" })
+								return Promise.resolve({
+									code: 1,
+									data: "登录已过期",
+									msg: "登录已过期",
+								})
+							}
+						})
+					}
+				} catch (error) {
+					uni.hideLoading()
+					uni.showToast({ title: "错误", icon: "none" })
+				}
 			}
 		}
 
@@ -259,7 +308,6 @@ http.interceptors.response.use(
 				mask: true,
 			})
 		}
-
 		return false
 	},
 )

From 44627cdc556484c52a3e1ab2ff0c9f3f6f576d10 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 25 Feb 2025 22:24:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A0=E6=84=9F=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/my.vue                       |   5 +-
 src/pages/tabbar/order.vue                    |   6 +-
 .../base-just-flot-nav/base-just-flot-nav.vue | 100 +++++++++---------
 .../components/base/base-nav/base-nav.vue     |  17 ++-
 src/sheep/utils/request.ts                    |  20 ++++
 5 files changed, 85 insertions(+), 63 deletions(-)

diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 0d97c75..ed049d3 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -12,7 +12,7 @@
 			<view class="m-l-30rpx" v-if="state.userInfo?.sysUser?.userId">
 				<view class="flex-row items-center">
 					<text class="sub-text-30">{{ state.userInfo?.sysUser?.name }}</text>
-					<text class="iconfont icon-youjiantou color-#666666 m-l-20rpx"></text>
+					<!-- <text class="iconfont icon-youjiantou color-#666666 m-l-20rpx"></text> -->
 				</view>
 				<text class="sub-text-26">ID {{ state.userInfo?.sysUser?.userId }}</text>
 			</view>
@@ -202,7 +202,8 @@ onLoad(() => {
 				icon: "/static/icon/login.png",
 				router: "/pages/test/login",
 		  })
-		: checkAppInfo()
+		: ""
+	// checkAppInfo()
 })
 onShow(() => {
 	getStorageUserInfo()
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 0bb0603..d4a0795 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -145,8 +145,10 @@ const doRefund = (v: any) => {
 					</view>
 				</view>
 				<view v-if="['5', '10'].includes(v.orderStatus)" class="flex-row items-center justify-end p-t-20rpx">
-					<view v-if="v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款 </view>
-					<view v-if="v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)"> 核销码 </view>
+					<view v-if="false && v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款</view>
+					<view v-if="false && v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)">
+						核销码
+					</view>
 				</view>
 			</view>
 		</z-paging>
diff --git a/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue b/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
index cad5ec8..4bd72be 100644
--- a/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
+++ b/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
@@ -1,77 +1,77 @@
 <script setup>
-import { defineProps, computed } from 'vue'
-import { router } from '@@/index'
+import { defineProps, computed } from "vue"
+import { router } from "@@/index"
 
 const props = defineProps({
-    title: {
-        type: String,
-        default: '标题'
-    },
-    titleColor: {
-        type: String,
-        default: '#333'
-    },
-    bgColor: {
-        type: String,
-        default: 'white'
-    },
-    showLeft: {
-        type: Boolean,
-        default: true
-    }
+	title: {
+		type: String,
+		default: "标题",
+	},
+	titleColor: {
+		type: String,
+		default: "#333",
+	},
+	bgColor: {
+		type: String,
+		default: "white",
+	},
+	showLeft: {
+		type: Boolean,
+		default: true,
+	},
 })
 
 const isHistiry = computed(() => {
-    return router.hasHistory()
+	return router.hasHistory()
 })
 
 const isTabbar = computed(() => {
-    return router.hasTabbar()
+	return router.hasTabbar()
 })
 
 function doBackClick() {
-    router.back()
+	router.back()
 }
 
 function getNavTop() {
-    const { statusBarHeight } = uni.getSystemInfoSync();
-    return `${statusBarHeight}px`
+	const { statusBarHeight } = uni.getSystemInfoSync()
+	return `${statusBarHeight}px`
 }
 </script>
 
 <template>
-    <view class="navbar" :style="{ top: getNavTop() }">
-        <view class="navbar_center" v-if="showLeft && !isTabbar" @tap="doBackClick">
-            <text class="sicon-back icon" v-if="isHistiry" />
-            <text class="sicon-home icon" v-else />
-        </view>
-    </view>
+	<view v-if="false" class="navbar" :style="{ top: getNavTop() }">
+		<view class="navbar_center" v-if="showLeft && !isTabbar" @tap="doBackClick">
+			<text class="sicon-back icon" v-if="isHistiry" />
+			<text class="sicon-home icon" v-else />
+		</view>
+	</view>
 </template>
 
 <style lang="scss" scoped>
 .navbar {
-    position: absolute;
-    left: 20rpx;
-    height: 44px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
+	position: absolute;
+	left: 20rpx;
+	height: 44px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
 
-    &_center {
-        background: #fff;
-        box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
-        border-radius: 28rpx;
-        width: 56rpx;
-        height: 56rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        z-index: 100;
+	&_center {
+		background: #fff;
+		box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+		border-radius: 28rpx;
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 100;
 
-        &>.icon {
-            font-size: 32rpx;
-            color: #333;
-        }
-    }
+		& > .icon {
+			font-size: 32rpx;
+			color: #333;
+		}
+	}
 }
 </style>
diff --git a/src/sheep/components/base/base-nav/base-nav.vue b/src/sheep/components/base/base-nav/base-nav.vue
index 31d2a28..44cc905 100644
--- a/src/sheep/components/base/base-nav/base-nav.vue
+++ b/src/sheep/components/base/base-nav/base-nav.vue
@@ -1,24 +1,24 @@
 <script setup>
-import { defineProps, computed } from 'vue'
-import { router } from '@@/index'
+import { defineProps, computed } from "vue"
+import { router } from "@@/index"
 
 const props = defineProps({
 	title: {
 		type: String,
-		default: '标题'
+		default: "标题",
 	},
 	titleColor: {
 		type: String,
-		default: '#333'
+		default: "#333",
 	},
 	bgColor: {
 		type: String,
-		default: 'white'
+		default: "white",
 	},
 	showLeft: {
 		type: Boolean,
-		default: true
-	}
+		default: true,
+	},
 })
 
 const isHistiry = computed(() => {
@@ -32,11 +32,10 @@ const isTabbar = computed(() => {
 function doBackClick() {
 	router.back()
 }
-
 </script>
 
 <template>
-	<view class="navbar" :style="{ backgroundColor: bgColor, height: '44px' }">
+	<view v-if="false" class="navbar" :style="{ backgroundColor: bgColor, height: '44px' }">
 		<view class="navbar_left" v-if="showLeft && !isTabbar" @tap="doBackClick">
 			<text class="sicon-back icon" v-if="isHistiry" />
 			<text class="sicon-home icon" v-else />
diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index 37c1547..753855a 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -250,6 +250,26 @@ http.interceptors.response.use(
 		// 成功提示
 		responseHelpers.handleSuccessMessage(response)
 
+		if (isEmpty(uni.getStorageSync(TOKEN_KEY))) {
+			const params = new URL(window.location.href).searchParams
+			const token = params.get("uabaseToken")
+			if (token) {
+				try {
+					userApi.auth(token).then(async (res) => {
+						if (res?.code === 0) {
+							uni.setStorageSync(TOKEN_KEY, res.data)
+							const { data: userData } = await userApi.userInfo()
+							uni.setStorageSync(USER_INFO_KEY, userData)
+						} else {
+							uni.showToast({ title: "获取浙政钉用户信息失败", icon: "none" })
+						}
+					})
+				} catch (error) {
+					uni.showToast({ title: "错误", icon: "none" })
+				}
+			}
+		}
+
 		// 登录过期处理
 		if (response.data.code === 1) {
 			responseHelpers.handleLoginExpired()

From f940aed3424a5fbd55de7bcd4728e3c5ee882e31 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 26 Feb 2025 09:14:19 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/order.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index d4a0795..9661c42 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -145,10 +145,8 @@ const doRefund = (v: any) => {
 					</view>
 				</view>
 				<view v-if="['5', '10'].includes(v.orderStatus)" class="flex-row items-center justify-end p-t-20rpx">
-					<view v-if="false && v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款</view>
-					<view v-if="false && v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)">
-						核销码
-					</view>
+					<!-- <view v-if="v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款</view> -->
+					<!-- <view v-if="v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)">核销码</view> -->
 				</view>
 			</view>
 		</z-paging>

From fa8ec6a1ceb9b508ed7ba1c00d58c086a45d49b3 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 5 Mar 2025 21:53:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?token=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sheep/hooks/use-token.ts |  42 ++---
 src/sheep/utils/request.ts   | 292 +++++++++++++++++------------------
 2 files changed, 163 insertions(+), 171 deletions(-)

diff --git a/src/sheep/hooks/use-token.ts b/src/sheep/hooks/use-token.ts
index 03afddd..631ac04 100644
--- a/src/sheep/hooks/use-token.ts
+++ b/src/sheep/hooks/use-token.ts
@@ -28,23 +28,29 @@ export const useStaticCheckLogin = () => {
 export const useCheckLogin = async (): Promise<boolean> => {
 	const tokenKey = storageConstant.TOKEN
 	const tokenStorage = uni.getStorageSync(tokenKey)
-	if (tokenStorage) return true
-	uni.showModal({
-		title: "提示",
-		content: "您还未登录，请先登录",
-		confirmColor: "#0094ff",
-		cancelText: "取消",
-		confirmText: "去登录",
-		success: async (res) => {
-			if (res.confirm) {
-				isDevEnv() ? jump("/pages/test/login", {}, 3) : jump("/pages/tabbar/my", {}, 3)
+	if (isDevEnv()) {
+		if (tokenStorage) return true
+		uni.showModal({
+			title: "提示",
+			content: "您还未登录，请先登录",
+			confirmColor: "#0094ff",
+			cancelText: "取消",
+			confirmText: "去登录",
+			success: async (res) => {
+				if (res.confirm) {
+					jump("/pages/test/login", {}, 3)
+					return
+				}
+				if (!res.confirm) {
+					return
+				}
 				return
-			}
-			if (!res.confirm) {
-				return
-			}
-			return
-		},
-	})
-	return false
+			},
+		})
+		return false
+	} else {
+		if (tokenStorage) return true
+		uni.showToast({ title: "你还未登录", icon: "none" })
+		return false
+	}
 }
diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index 753855a..853a5b7 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -55,8 +55,64 @@ const getAuthHeader = (tokenStorage: any) => {
 	return tokenStorage?.accessToken?.tokenValue ? `Bearer ${tokenStorage.accessToken.tokenValue}` : null
 }
 
+// token过期刷新检查
+const checkAndRefreshToken = async (tokenStorage: any) => {
+	const { accessToken } = tokenStorage
+	if (!accessToken) return
+
+	const expiresDate = new Date(accessToken.expiresAt).getTime()
+	console.log("现在的时间大于过期时间吗：", new Date().getTime() >= expiresDate)
+
+	if (new Date().getTime() >= expiresDate) {
+		// try {
+		// 	const refreshData: any = await request({
+		// 		url: "/auth/oauth2/token",
+		// 		method: "POST",
+		// 		params: { grant_type: "refresh_token" },
+		// 		data: JSON.stringify({
+		// 			scope: "server",
+		// 			refresh_token: tokenStorage.refreshToken.tokenValue,
+		// 		}),
+		// 		header: {
+		// 			skipToken: true,
+		// 			Authorization: "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_APP_CLIENT),
+		// 			"content-type": "application/x-www-form-urlencoded",
+		// 		},
+		// 	})
+
+		// 	if (refreshData.code === 0 && !isEmpty(refreshData.data)) {
+		// 		console.log("refreshData.data", refreshData.data)
+
+		// 		// 刷新成功,更新token并重试请求
+		// 		uni.setStorageSync(TOKEN_KEY, refreshData.data)
+		// 	}
+		// } catch (refreshError) {
+		// 	console.error("Token refresh failed:", refreshError)
+		// }
+		try {
+			uni.showLoading({ title: "加载中...", mask: true })
+			const params = new URL(window.location.href).searchParams
+			const token = params.get("uabaseToken")
+			if (token) {
+				const res = await userApi.auth(token)
+				if (res?.code === 0) {
+					uni.setStorageSync(TOKEN_KEY, res.data)
+				} else {
+					uni.removeStorageSync(TOKEN_KEY)
+					uni.removeStorageSync(USER_INFO_KEY)
+					uni.showToast({ title: res.msg, icon: "none" })
+				}
+			}
+		} catch (error) {
+			uni.showToast({ title: "错误", icon: "none" })
+		} finally {
+			uni.hideLoading()
+		}
+	}
+}
+
 // 请求拦截器
-http.interceptors.request.use((config) => {
+http.interceptors.request.use(async (config) => {
 	const tokenStorage = uni.getStorageSync(TOKEN_KEY)
 	const config_header: any = config?.header || {}
 
@@ -66,14 +122,6 @@ http.interceptors.request.use((config) => {
 		config_header["CLIENT-TOC"] = "Y"
 	}
 
-	// 设置认证头
-	if (config.url !== "/sys/auth/refresh-token" && config.url !== "/auth/oauth2/token") {
-		const authHeader = getAuthHeader(tokenStorage)
-		if (authHeader) {
-			config_header.Authorization = authHeader
-		}
-	}
-
 	// 处理 loading
 	if (config.custom?.showLoading) {
 		LoadingInstance.count++
@@ -86,115 +134,67 @@ http.interceptors.request.use((config) => {
 		}
 	}
 
+	// 设置认证头
+	if (
+		!config.url?.startsWith("/thirdparty/thirdPartyOAth2/zzdsso") &&
+		config.url !== "/sys/auth/refresh-token" &&
+		config.url !== "/auth/oauth2/token"
+	) {
+		if (!isEmpty(tokenStorage)) {
+			// token过期刷新检查
+			checkAndRefreshToken(tokenStorage)
+
+			const authHeader = getAuthHeader(tokenStorage)
+			if (authHeader) {
+				config_header.Authorization = authHeader
+			}
+		} else {
+			// token不存在，则发起登录
+			const params = new URL(window.location.href).searchParams
+			const token = params.get("uabaseToken")
+
+			if (token) {
+				try {
+					uni.showLoading({ title: "加载中...", mask: true })
+					const res = await userApi.auth(token)
+					if (res?.code === 0) {
+						uni.setStorageSync(TOKEN_KEY, res.data)
+						const { data: userData } = await userApi.userInfo()
+						uni.setStorageSync(USER_INFO_KEY, userData)
+
+						const authHeader = getAuthHeader(tokenStorage)
+						if (authHeader) {
+							config_header.Authorization = authHeader
+						}
+					} else {
+						uni.showToast({ title: "获取浙政钉用户信息失败", icon: "none" })
+					}
+				} catch (error) {
+					uni.showToast({ title: "错误", icon: "none" })
+				} finally {
+					uni.hideLoading()
+				}
+			}
+		}
+	}
+
 	return config
 }, Promise.reject)
 
-// 定义响应处理的辅助函数
-const responseHelpers = {
-	// 处理错误响应
-	handleErrorResponse(response: any) {
-		if (!response.config?.custom?.showError) return
+// 处理错误响应
+const handleErrorResponse = (response: any) => {
+	if (!response.config?.custom?.showError) return
 
-		switch (response.data.code) {
-			case 401:
-				this.handleUnauthorized()
-				break
-			case 424:
-				try {
-					const params = new URL(window.location.href).searchParams
-					const token = params.get("uabaseToken")
-					if (token) {
-						userApi.auth(token).then((res) => {
-							if (res?.code === 0) {
-								uni.setStorageSync(TOKEN_KEY, res.data)
-							} else {
-								uni.removeStorageSync(TOKEN_KEY)
-								uni.removeStorageSync(USER_INFO_KEY)
-								// uni.showToast({ title: "登录已过期", icon: "none" })
-								return Promise.resolve({
-									code: 1,
-									data: "登录已过期",
-									msg: "登录已过期",
-								})
-							}
-						})
-					}
-				} catch (error) {
-					uni.hideLoading()
-					uni.showToast({ title: "错误", icon: "none" })
-				}
-				break
-			default:
-				uni.showToast({
-					title: response.data.msg || "服务器开小差啦,请稍后再试~",
-					icon: "none",
-					mask: true,
-				})
-		}
-	},
-
-	// 处理未授权情况
-	handleUnauthorized() {
-		setTimeout(() => {
-			uni.removeStorageSync(TOKEN_KEY)
-			uni.removeStorageSync(USER_INFO_KEY)
-			router.jump("/pages/tabbar/my", {}, 2)
-		}, 500)
-	},
-
-	// 处理成功提示
-	handleSuccessMessage(response: any) {
-		const { data, config } = response
-		if (data.code === 0 && data.message && config?.custom?.showSuccess) {
-			uni.showToast({
-				title: config.custom.successMsg || data.message,
-				icon: "none",
-			})
-		}
-	},
-
-	// 处理登录过期
-	handleLoginExpired() {
-		uni.removeStorageSync(TOKEN_KEY)
-		uni.removeStorageSync(USER_INFO_KEY)
-		uni.showToast({ title: "登录已过期，请重新登录", icon: "none" })
-		isDevEnv() ? router.jump("/pages/test/login") : router.jump("/pages/tabbar/my")
-	},
-
-	// 检查并刷新token
-	checkAndRefreshToken(tokenStorage: any) {
-		const { accessToken } = tokenStorage
-		if (!accessToken) return
-
-		const issuedDate = new Date(accessToken.issuedAt).getTime()
-		console.log(new Date().getTime() - issuedDate)
-
-		if (new Date().getTime() - issuedDate >= 1000 * 60 * 20) {
-			// try {
-			// 	const refreshData: any = await request({
-			// 		url: "/auth/oauth2/token",
-			// 		method: "POST",
-			// 		params: { grant_type: "refresh_token" },
-			// 		data: JSON.stringify({
-			// 			scope: "server",
-			// 			refresh_token: tokenStorage.refreshToken.tokenValue,
-			// 		}),
-			// 		header: {
-			// 			skipToken: true,
-			// 			Authorization: "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_APP_CLIENT),
-			// 			"content-type": "application/x-www-form-urlencoded",
-			// 		},
-			// 	})
-
-			// 	if (refreshData.code === 0 && !isEmpty(refreshData.data)) {
-			// 		console.log("refreshData.data", refreshData.data)
-
-			// 		// 刷新成功,更新token并重试请求
-			// 		uni.setStorageSync(TOKEN_KEY, refreshData.data)
-			// 	}
-			// } catch (refreshError) {
-			// 	console.error("Token refresh failed:", refreshError)
-			// }
+	switch (response.data.code) {
+		case 401:
+			// 处理未授权情况
+			setTimeout(() => {
+				uni.removeStorageSync(TOKEN_KEY)
+				uni.removeStorageSync(USER_INFO_KEY)
+				console.log("未授权")
+			}, 500)
+			break
+		case 424:
 			try {
 				const params = new URL(window.location.href).searchParams
 				const token = params.get("uabaseToken")
@@ -218,15 +218,30 @@ const responseHelpers = {
 				uni.hideLoading()
 				uni.showToast({ title: "错误", icon: "none" })
 			}
-		}
-	},
+			break
+		default:
+			uni.showToast({
+				title: response.data.msg || "服务器开小差啦,请稍后再试~",
+				icon: "none",
+				mask: true,
+			})
+	}
+}
+
+// 处理成功提示
+const handleSuccessMessage = (response: any) => {
+	const { data, config } = response
+	if (data.code === 0 && data.message && config?.custom?.showSuccess) {
+		uni.showToast({
+			title: config.custom.successMsg || data.message,
+			icon: "none",
+		})
+	}
 }
 
 // 响应拦截器
 http.interceptors.response.use(
 	async (response) => {
-		console.log("response", response)
-
 		// 关闭loading
 		if (response.config?.custom?.showLoading) {
 			closeLoading()
@@ -241,45 +256,14 @@ http.interceptors.response.use(
 			})
 		}
 
-		// 错误处理
+		// 错误处理和错误提示
 		if (response.data.code !== 0) {
-			responseHelpers.handleErrorResponse(response)
+			handleErrorResponse(response)
 			return Promise.resolve(response.data)
 		}
 
 		// 成功提示
-		responseHelpers.handleSuccessMessage(response)
-
-		if (isEmpty(uni.getStorageSync(TOKEN_KEY))) {
-			const params = new URL(window.location.href).searchParams
-			const token = params.get("uabaseToken")
-			if (token) {
-				try {
-					userApi.auth(token).then(async (res) => {
-						if (res?.code === 0) {
-							uni.setStorageSync(TOKEN_KEY, res.data)
-							const { data: userData } = await userApi.userInfo()
-							uni.setStorageSync(USER_INFO_KEY, userData)
-						} else {
-							uni.showToast({ title: "获取浙政钉用户信息失败", icon: "none" })
-						}
-					})
-				} catch (error) {
-					uni.showToast({ title: "错误", icon: "none" })
-				}
-			}
-		}
-
-		// 登录过期处理
-		if (response.data.code === 1) {
-			responseHelpers.handleLoginExpired()
-		}
-
-		// Token 刷新检查
-		const tokenStorage = uni.getStorageSync(TOKEN_KEY)
-		if (!isEmpty(tokenStorage) && !response.config.url?.startsWith("/thirdparty/thirdPartyOAth2/zzdsso")) {
-			await responseHelpers.checkAndRefreshToken(tokenStorage)
-		}
+		handleSuccessMessage(response)
 
 		return Promise.resolve(response.data)
 	},
@@ -295,6 +279,7 @@ http.interceptors.response.use(
 				return false
 			} else {
 				try {
+					uni.showLoading({ title: "加载中...", mask: true })
 					const params = new URL(window.location.href).searchParams
 					const token = params.get("uabaseToken")
 					if (token) {
@@ -314,8 +299,9 @@ http.interceptors.response.use(
 						})
 					}
 				} catch (error) {
-					uni.hideLoading()
 					uni.showToast({ title: "错误", icon: "none" })
+				} finally {
+					uni.hideLoading()
 				}
 			}
 		}