diff --git a/uniapp/youjiala/.editorconfig b/uniapp/youjiala/.editorconfig new file mode 100644 index 0000000..5cadaca --- /dev/null +++ b/uniapp/youjiala/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false \ No newline at end of file diff --git a/uniapp/youjiala/src/common/http.interceptor.ts b/uniapp/youjiala/src/common/http.interceptor.ts index 943a61b..273bfa2 100644 --- a/uniapp/youjiala/src/common/http.interceptor.ts +++ b/uniapp/youjiala/src/common/http.interceptor.ts @@ -69,6 +69,15 @@ export function clearLoginState() { uni.removeStorageSync(JWT_STORAGE_KEY); } +/** + * 是否已有登录会话:只认请求层的 AccessToken(令牌唯一来源,与 nav-guard 口径一致)。 + * 不在此判过期——AccessToken 过期时请求层会拿 RefreshToken 自动续期,续期失败再 goLogin 退回登录页, + * 所以"登录过"就足以决定冷启动是否直接进 dashboard。 + */ +export function hasLoginSession(): boolean { + return !!getJwtInfo()?.AccessToken; +} + function getToken(): string { return getJwtInfo()?.AccessToken ?? ""; } diff --git a/uniapp/youjiala/src/components/admin-list/admin-list.vue b/uniapp/youjiala/src/components/admin-list/admin-list.vue index 6b70c93..6682c16 100644 --- a/uniapp/youjiala/src/components/admin-list/admin-list.vue +++ b/uniapp/youjiala/src/components/admin-list/admin-list.vue @@ -188,9 +188,8 @@ defineExpose({ refresh, clearSelection, selectedRows }); {{ filterCount }} - - - + + @@ -302,17 +301,6 @@ defineExpose({ refresh, clearSelection, selectedRows }); border-radius: 16rpx; } -/* 页面自定义的次级工具(如"新增")走白底一行,与搜索栏区分 */ -.toolbar-extra { - display: flex; - flex-direction: row; - align-items: center; - justify-content: flex-end; - padding: 4rpx 24rpx 16rpx; - background-color: #ffffff; - border-bottom: 1rpx solid $u-border-color; -} - .card { display: flex; flex-direction: row; diff --git a/uniapp/youjiala/src/components/app-tabbar/app-tabbar.vue b/uniapp/youjiala/src/components/app-tabbar/app-tabbar.vue index 2726bfe..3ba2db7 100644 --- a/uniapp/youjiala/src/components/app-tabbar/app-tabbar.vue +++ b/uniapp/youjiala/src/components/app-tabbar/app-tabbar.vue @@ -2,8 +2,9 @@ diff --git a/uniapp/youjiala/src/locale/lang/en-US.json b/uniapp/youjiala/src/locale/lang/en-US.json index 7297178..a1354e4 100644 --- a/uniapp/youjiala/src/locale/lang/en-US.json +++ b/uniapp/youjiala/src/locale/lang/en-US.json @@ -7,6 +7,13 @@ "cancelBut": "Cancel", "cultureLabel": "Language:" }, + "TabBar": { + "home": "Home", + "file": "Files", + "media": "Media", + "share": "Share", + "mine": "Me" + }, "AdminPage": { "filterBut": "Filter", "filterTitle": "Filter Conditions", diff --git a/uniapp/youjiala/src/locale/lang/zh-CN.json b/uniapp/youjiala/src/locale/lang/zh-CN.json index a7f3f72..4f1cecd 100644 --- a/uniapp/youjiala/src/locale/lang/zh-CN.json +++ b/uniapp/youjiala/src/locale/lang/zh-CN.json @@ -7,6 +7,13 @@ "cancelBut": "取消", "cultureLabel": "语言:" }, + "TabBar": { + "home": "首页", + "file": "文件", + "media": "多媒体", + "share": "共享", + "mine": "我的" + }, "AdminPage": { "filterBut": "筛选", "filterTitle": "筛选条件", diff --git a/uniapp/youjiala/src/pages.json b/uniapp/youjiala/src/pages.json index fa9346e..f0ac1a4 100644 --- a/uniapp/youjiala/src/pages.json +++ b/uniapp/youjiala/src/pages.json @@ -28,6 +28,19 @@ }, { "path": "pages/security/actor-enquiry" + }, + // 底部导航测试页(首页复用上面的 dashboard):文件/多媒体/共享/我的 + { + "path": "pages/tab/file" + }, + { + "path": "pages/tab/media" + }, + { + "path": "pages/tab/share" + }, + { + "path": "pages/tab/mine" } ], // 全局配置 diff --git a/uniapp/youjiala/src/pages/dashboard/dashboard.vue b/uniapp/youjiala/src/pages/dashboard/dashboard.vue index 53b9ea5..b7acf5b 100644 --- a/uniapp/youjiala/src/pages/dashboard/dashboard.vue +++ b/uniapp/youjiala/src/pages/dashboard/dashboard.vue @@ -32,7 +32,7 @@ useAuthGuard(() => {