From b787e27d80cc7d71e102d7bc4f150c8a962a60e1 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 10 Aug 2026 01:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/my.vue | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 7b8e245..49e1077 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -168,39 +168,35 @@ const storage = {
 }
 
 const login = {
-	// 检查应用环境并登录
+	// 检查应用环境并登录（浙政钉走 getAuthCode/zzdsso，诗画走 authsh；勿再只认 URL uabaseToken）
 	checkAppInfo: async () => {
 		try {
-			// 先尝试诗画登录
-			const shihuaResult = await login.shihuaLogin()
-			if (shihuaResult) return
-
-			// 尝试浙政钉登录
-			const zhengdingResult = login.zhengdingLogin()
-			if (zhengdingResult) return
-
-			uni.showToast({ title: "当前登录环境未知", icon: "none" })
+			const appInfo = await getAppInfo()
+			if (appInfo !== APPENV.ZZD && appInfo !== APPENV.SH) {
+				uni.showToast({ title: "当前登录环境未知", icon: "none" })
+				return
+			}
+			const ok = await ensureBizLogin()
+			if (ok) {
+				storage.getUserInfo()
+			}
 		} catch (error) {
 			console.error("登录失败:", error)
 			uni.showToast({ title: "登录失败", icon: "none" })
 		}
 	},
 
-	// 诗画环境登录：走统一 ensureBizLogin，避免与请求拦截器各打一遍 /shjnsso
+	// 保留：开发/兼容旧调用；生产点「请先登录」走 checkAppInfo → ensureBizLogin
 	shihuaLogin: async () => {
-		const appInfo = await (window as any).CP2.getAppInfo()
-		if (appInfo.code == 0) return false
+		const env = await getAppInfo()
+		if (env !== APPENV.SH) return false
 		return await ensureBizLogin()
 	},
 
-	// 浙政钉登录
-	zhengdingLogin: () => {
-		const params = new URL(window.location.href).searchParams
-		const token = params.get("uabaseToken")
-		if (token) {
-			return login.doLogin(2, token, "", "")
-		}
-		return false
+	zhengdingLogin: async () => {
+		const env = await getAppInfo()
+		if (env !== APPENV.ZZD) return false
+		return await ensureBizLogin()
 	},
 
 	// 执行登录操作 - loginType 1:诗画登录 2:浙政钉登录