From 06a17c236d4cb9b8da75fce43af938cb7ea510bf Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 15 十二月 2025 09:50:12 +0800
Subject: [PATCH] feat: 优化企业微信判断，优化gps分断处理
---
app/App.vue | 157 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 123 insertions(+), 34 deletions(-)
diff --git a/app/App.vue b/app/App.vue
index 298be3a..f45cc42 100644
--- a/app/App.vue
+++ b/app/App.vue
@@ -3,6 +3,8 @@
import store from '@/store'
import { getToken } from '@/utils/auth'
import { getUnreadCount } from '@/api/message'
+ import storage from '@/utils/storage'
+ import { redirectToLoginByEnvironment } from '@/utils/wechat'
export default {
data() {
@@ -11,9 +13,13 @@
lastToken: null // 鐢ㄤ簬妫�娴� token 鍙樺寲
}
},
- onLaunch: function() {
+ onLaunch: function(options) {
+ console.log('App onLaunch, options:', options);
this.lastToken = getToken()
- this.initApp()
+ this.initApp(options)
+
+ // 妫�鏌ュ苟娓呯悊瀛樺偍绌洪棿
+ this.checkStorage()
// 鐩戝惉鐢ㄦ埛鐧诲綍浜嬩欢
uni.$on('user-login', () => {
@@ -32,7 +38,11 @@
this.stopMessagePolling()
this.lastToken = null
// 娓呴櫎娑堟伅寰芥爣
- uni.removeTabBarBadge({ index: 3 })
+ try {
+ uni.removeTabBarBadge({ index: 3 })
+ } catch (e) {
+ console.error('娓呴櫎娑堟伅寰芥爣澶辫触:', e)
+ }
})
},
onShow: function() {
@@ -53,7 +63,8 @@
}
// 搴旂敤鏄剧ず鏃跺埛鏂版湭璇绘秷鎭暟閲�
- if (currentToken) {
+ // 娉ㄦ剰锛氬彧鏈夊凡鐧诲綍涓斾笉鍦ㄧ櫥褰曢〉闈㈡椂鎵嶈皟鐢�
+ if (currentToken && !this.isLoginPage()) {
this.updateUnreadMessageBadge()
// 閲嶆柊鍚姩杞锛堝鏋滀箣鍓嶅凡鍋滄锛�
if (!this.messagePollingTimer) {
@@ -67,13 +78,15 @@
},
methods: {
// 鍒濆鍖栧簲鐢�
- initApp() {
- // 鍒濆鍖栧簲鐢ㄩ厤缃�
- this.initConfig()
- // 妫�鏌ョ敤鎴风櫥褰曠姸鎬�
- //#ifdef H5
- this.checkLogin()
- //#endif
+ initApp(options) {
+ try {
+ // 鍒濆鍖栧簲鐢ㄩ厤缃�
+ this.initConfig()
+ // 妫�鏌ョ敤鎴风櫥褰曠姸鎬佸苟鑷姩璺宠浆鍒板悎閫傜殑鐧诲綍椤甸潰
+ this.checkLoginAndRedirect(options)
+ } catch (e) {
+ console.error('鍒濆鍖栧簲鐢ㄥけ璐�:', e)
+ }
// 娉ㄦ剰锛氫笉鍦ㄥ簲鐢ㄥ惎鍔ㄦ椂鑷姩鍚姩杞
// 鍙湁鍦ㄧ敤鎴蜂富鍔ㄧ櫥褰曟垚鍔熷悗鎵嶅惎鍔紙閫氳繃 user-login 浜嬩欢瑙﹀彂锛�
@@ -81,9 +94,41 @@
initConfig() {
this.globalData.config = config
},
- checkLogin() {
- if (!getToken()) {
- this.$tab.reLaunch('/pages/login')
+ // 妫�鏌ョ櫥褰曠姸鎬佸苟鑷姩璺宠浆鍒板悎閫傜殑鐧诲綍椤甸潰
+ checkLoginAndRedirect(options) {
+ try {
+ if (!getToken()) {
+ console.log('鐢ㄦ埛鏈櫥褰曪紝鍑嗗璺宠浆鍒扮櫥褰曢〉闈�')
+ // 浣跨敤宸ュ叿绫绘牴鎹幆澧冭嚜鍔ㄨ烦杞埌鍚堥�傜殑鐧诲綍椤甸潰
+ redirectToLoginByEnvironment(options, this.$tab);
+ } else {
+ console.log('鐢ㄦ埛宸茬櫥褰曪紝鏃犻渶璺宠浆')
+ }
+ } catch (e) {
+ console.error('妫�鏌ョ櫥褰曠姸鎬佸苟璺宠浆澶辫触:', e)
+ // fallback鍒版櫘閫氱櫥褰曢〉闈�
+ try {
+ this.$tab.reLaunch('/pages/login');
+ } catch (fallbackError) {
+ console.error('fallback璺宠浆涔熷け璐ヤ簡:', fallbackError);
+ }
+ }
+ },
+
+ // 鍒ゆ柇褰撳墠鏄惁鍦ㄧ櫥褰曢〉闈�
+ isLoginPage() {
+ try {
+ const pages = getCurrentPages()
+ if (pages.length === 0) {
+ return false
+ }
+ const currentPage = pages[pages.length - 1]
+ const route = currentPage.route || ''
+ // 鍒ゆ柇鏄惁涓虹櫥褰曠浉鍏抽〉闈�
+ return route.includes('login') || route.includes('register')
+ } catch (e) {
+ console.error('鍒ゆ柇鏄惁涓虹櫥褰曢〉闈㈠け璐�:', e)
+ return false
}
},
@@ -101,15 +146,23 @@
if (count > 0) {
// 璁剧疆寰芥爣
- uni.setTabBarBadge({
- index: 3, // 娑堟伅椤甸潰鍦╰abBar涓殑绱㈠紩浣嶇疆锛�0寮�濮嬶級
- text: count > 99 ? '99+' : count.toString()
- })
+ try {
+ uni.setTabBarBadge({
+ index: 3, // 娑堟伅椤甸潰鍦╰abBar涓殑绱㈠紩浣嶇疆锛�0寮�濮嬶級
+ text: count > 99 ? '99+' : count.toString()
+ })
+ } catch (e) {
+ console.error('璁剧疆娑堟伅寰芥爣澶辫触:', e)
+ }
} else {
// 绉婚櫎寰芥爣
- uni.removeTabBarBadge({
- index: 3
- })
+ try {
+ uni.removeTabBarBadge({
+ index: 3
+ })
+ } catch (e) {
+ console.error('绉婚櫎娑堟伅寰芥爣澶辫触:', e)
+ }
}
}).catch(error => {
console.error('鑾峰彇鏈娑堟伅鏁伴噺澶辫触:', error)
@@ -118,22 +171,58 @@
// 鍚姩娑堟伅杞
startMessagePolling() {
- // 姣�30绉掕疆璇竴娆�
- this.messagePollingTimer = setInterval(() => {
- if (getToken()) {
- this.updateUnreadMessageBadge()
- } else {
- // 濡傛灉鐢ㄦ埛宸茬櫥鍑猴紝鍋滄杞
- this.stopMessagePolling()
- }
- }, 30000) // 30绉�
+ try {
+ // 姣�30绉掕疆璇竴娆�
+ this.messagePollingTimer = setInterval(() => {
+ if (getToken()) {
+ this.updateUnreadMessageBadge()
+ } else {
+ // 濡傛灉鐢ㄦ埛宸茬櫥鍑猴紝鍋滄杞
+ this.stopMessagePolling()
+ }
+ }, 30000) // 30绉�
+ } catch (e) {
+ console.error('鍚姩娑堟伅杞澶辫触:', e)
+ }
},
// 鍋滄娑堟伅杞
stopMessagePolling() {
- if (this.messagePollingTimer) {
- clearInterval(this.messagePollingTimer)
- this.messagePollingTimer = null
+ try {
+ if (this.messagePollingTimer) {
+ clearInterval(this.messagePollingTimer)
+ this.messagePollingTimer = null
+ }
+ } catch (e) {
+ console.error('鍋滄娑堟伅杞澶辫触:', e)
+ }
+ },
+
+ // 妫�鏌ュ瓨鍌ㄧ┖闂�
+ checkStorage() {
+ try {
+ // 鑾峰彇瀛樺偍淇℃伅
+ const info = storage.getStorageInfo()
+
+ if (info) {
+ const usagePercent = (info.currentSize / info.limitSize) * 100
+ console.log(`馃捑 瀛樺偍浣跨敤鎯呭喌: ${usagePercent.toFixed(2)}% (${info.currentSize}KB / ${info.limitSize}KB)`)
+
+ // 濡傛灉浣跨敤瓒呰繃 80%锛岃嚜鍔ㄦ竻鐞�
+ if (usagePercent > 80) {
+ console.warn('鈿狅笍 瀛樺偍绌洪棿浣跨敤瓒呰繃 80%锛屽紑濮嬭嚜鍔ㄦ竻鐞�...')
+ storage.checkAndClean()
+
+ // 鍐嶆妫�鏌�
+ const newInfo = storage.getStorageInfo()
+ if (newInfo) {
+ const newUsagePercent = (newInfo.currentSize / newInfo.limitSize) * 100
+ console.log(`鉁� 娓呯悊鍚庝娇鐢ㄦ儏鍐�: ${newUsagePercent.toFixed(2)}%`)
+ }
+ }
+ }
+ } catch (e) {
+ console.error('妫�鏌ュ瓨鍌ㄥけ璐�:', e)
}
}
}
@@ -142,4 +231,4 @@
<style lang="scss">
@import '@/static/scss/index.scss'
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1