修复优化
This commit is contained in:
1 parent
87307392e4
commit
b787e27d80
1 file changed
+17
-21
+17
-21
@@ -168,39 +168,35 @@ const storage = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const login = {
|
const login = {
|
||||||
// 检查应用环境并登录
|
// 检查应用环境并登录(浙政钉走 getAuthCode/zzdsso,诗画走 authsh;勿再只认 URL uabaseToken)
|
||||||
checkAppInfo: async () => {
|
checkAppInfo: async () => {
|
||||||
try {
|
try {
|
||||||
// 先尝试诗画登录
|
const appInfo = await getAppInfo()
|
||||||
const shihuaResult = await login.shihuaLogin()
|
if (appInfo !== APPENV.ZZD && appInfo !== APPENV.SH) {
|
||||||
if (shihuaResult) return
|
uni.showToast({ title: "当前登录环境未知", icon: "none" })
|
||||||
|
return
|
||||||
// 尝试浙政钉登录
|
}
|
||||||
const zhengdingResult = login.zhengdingLogin()
|
const ok = await ensureBizLogin()
|
||||||
if (zhengdingResult) return
|
if (ok) {
|
||||||
|
storage.getUserInfo()
|
||||||
uni.showToast({ title: "当前登录环境未知", icon: "none" })
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("登录失败:", error)
|
console.error("登录失败:", error)
|
||||||
uni.showToast({ title: "登录失败", icon: "none" })
|
uni.showToast({ title: "登录失败", icon: "none" })
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// 诗画环境登录:走统一 ensureBizLogin,避免与请求拦截器各打一遍 /shjnsso
|
// 保留:开发/兼容旧调用;生产点「请先登录」走 checkAppInfo → ensureBizLogin
|
||||||
shihuaLogin: async () => {
|
shihuaLogin: async () => {
|
||||||
const appInfo = await (window as any).CP2.getAppInfo()
|
const env = await getAppInfo()
|
||||||
if (appInfo.code == 0) return false
|
if (env !== APPENV.SH) return false
|
||||||
return await ensureBizLogin()
|
return await ensureBizLogin()
|
||||||
},
|
},
|
||||||
|
|
||||||
// 浙政钉登录
|
zhengdingLogin: async () => {
|
||||||
zhengdingLogin: () => {
|
const env = await getAppInfo()
|
||||||
const params = new URL(window.location.href).searchParams
|
if (env !== APPENV.ZZD) return false
|
||||||
const token = params.get("uabaseToken")
|
return await ensureBizLogin()
|
||||||
if (token) {
|
|
||||||
return login.doLogin(2, token, "", "")
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
},
|
},
|
||||||
|
|
||||||
// 执行登录操作 - loginType 1:诗画登录 2:浙政钉登录
|
// 执行登录操作 - loginType 1:诗画登录 2:浙政钉登录
|
||||||
|
|||||||
Reference in new issue
Block a user