diff --git a/mpuniapp/App.uvue b/mpuniapp/App.uvue
index 3f23e9e..a6a8b5b 100644
--- a/mpuniapp/App.uvue
+++ b/mpuniapp/App.uvue
@@ -21,7 +21,7 @@
function routeOwnerHome() : void {
if (getAuthToken() != '') {
uni.switchTab({
- url: '/pages/owner/hall/index'
+ url: '/pages/owner/card/index'
})
return
}
@@ -34,6 +34,18 @@
// #ifdef APP
routeOwnerHome()
// #endif
+ // #ifdef H5
+ if (typeof window !== 'undefined') {
+ const hash = window.location.hash
+ if (!hash || hash === '#' || hash === '#/' || hash === '') {
+ if (getAuthToken() != '') {
+ window.location.hash = '#/pages/owner/card/index'
+ } else {
+ window.location.hash = '#/pages/common/login'
+ }
+ }
+ }
+ // #endif
})
onAppShow((res : OnShowOptions) => {
diff --git a/mpuniapp/pages/owner/card/index.uvue b/mpuniapp/pages/owner/card/index.uvue
index 14f5024..a832507 100644
--- a/mpuniapp/pages/owner/card/index.uvue
+++ b/mpuniapp/pages/owner/card/index.uvue
@@ -156,6 +156,11 @@ onLoad((options: CardHomePageOptions) => {
refreshCards(state);
applyQuotaHint();
});
+
+onShow(() => {
+ refreshCards(state);
+ applyQuotaHint();
+});
diff --git a/mpuniapp/pages/owner/profile/useProfile.uts b/mpuniapp/pages/owner/profile/useProfile.uts
index 605daac..ec54be9 100644
--- a/mpuniapp/pages/owner/profile/useProfile.uts
+++ b/mpuniapp/pages/owner/profile/useProfile.uts
@@ -384,6 +384,8 @@ export function resolveProfileText(key: string): string {
return isZh ? '偏好设置' : 'Preferences';
case 'languageLabel':
return isZh ? '界面语言' : 'Display Language';
+ case 'logout':
+ return isZh ? '退出登录' : 'Log out';
case 'workspaceSection':
return isZh ? '工作台' : 'Workspace';
case 'nfcScan':
diff --git a/mpuniapp/pages/owner/radar.uvue b/mpuniapp/pages/owner/radar.uvue
index 784891b..9319cef 100644
--- a/mpuniapp/pages/owner/radar.uvue
+++ b/mpuniapp/pages/owner/radar.uvue
@@ -101,6 +101,10 @@ onLoad((options: RadarPageOptions) => {
applyRadarOptions(state, options);
refreshTracks(state);
});
+
+onShow(() => {
+ refreshTracks(state);
+});