From 4402bf26bc530ad97fb69dce76b200260ecbe2f9 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 11 Sep 2026 18:35:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=B8=8E=E4=B8=BB=E9=A2=98=E8=89=B2=EF=BC=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E5=90=88=E5=B9=B6=E8=AE=BE=E7=BD=AE=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=B8=8E=E7=BC=93=E5=AD=98=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cursorrules                                  |  99 -------
 .gitattributes                                |  27 +-
 .gitignore                                    |   1 +
 LICENSE                                       |  42 +--
 eslint.config.mjs                             |   2 +-
 package.json                                  |   2 +-
 src/api/auth.ts                               |  32 +--
 src/api/dict.ts                               |   4 +-
 src/api/file.ts                               |   4 +-
 src/api/role.ts                               |   6 +-
 src/api/user.ts                               |   2 +-
 src/components/app-provider/index.vue         |  29 +-
 src/components/custom-navbar/index.vue        |   9 +-
 .../qiun-data-charts/qiun-data-charts.vue     |  15 +-
 src/components/qiun-loading/loading1.vue      |   8 +-
 src/components/qiun-loading/loading2.vue      |   8 +-
 src/components/qiun-loading/loading3.vue      |   8 +-
 src/components/qiun-loading/loading4.vue      |   8 +-
 src/components/qiun-loading/loading5.vue      |   8 +-
 src/composables/useCacheCleaner.ts            |  55 ++++
 src/composables/useCountdown.ts               |  21 +-
 src/composables/useLogout.ts                  |  22 ++
 src/composables/useNavbar.ts                  |  15 +-
 src/composables/usePagedList.ts               | 103 +++++---
 .../{useSmsCode.ts => useSmsLoginCode.ts}     |  23 +-
 src/composables/useTheme.ts                   |  24 +-
 src/config/index.ts                           |   2 +-
 src/config/{menu.ts => work-menu.ts}          |   6 +-
 src/constants/index.ts                        |  23 +-
 src/constants/permissions.ts                  |   9 +
 src/constants/storage-keys.ts                 |  16 ++
 src/main.ts                                   |   9 +-
 src/pages/index/index.vue                     | 249 ++++++++----------
 .../login/components/bind-mobile-popup.vue    |  22 +-
 src/pages/login/index.vue                     | 132 ++++++----
 src/pages/mine/components/community-card.vue  |  24 +-
 src/pages/mine/components/menu-section.vue    |  27 +-
 src/pages/mine/components/profile-card.vue    |  80 +++---
 src/pages/mine/components/quick-cards.vue     |   2 +-
 src/pages/mine/index.vue                      | 201 ++++++--------
 src/pages/work/index.vue                      |   8 +-
 src/router/index.ts                           |   4 +-
 src/static/icons/api.svg                      |  16 +-
 src/static/icons/git.svg                      |   1 -
 src/static/icons/{tree.svg => menu.svg}       |  23 +-
 src/static/icons/repo.svg                     |  10 +
 src/store/index.ts                            |  12 +-
 src/store/modules/theme.ts                    |  75 +++---
 src/store/modules/user.ts                     | 121 ++++-----
 src/styles/index.scss                         |  44 +++-
 src/styles/theme.scss                         | 195 ++++++--------
 src/subPages/mine/about/index.vue             |  84 +++---
 src/subPages/mine/account/index.vue           | 202 +++++++-------
 src/subPages/mine/official/index.vue          |  21 +-
 .../mine/profile/complete-profile/index.vue   |  47 ++--
 src/subPages/mine/profile/index.vue           | 142 +++++-----
 src/subPages/mine/scan-confirm/index.vue      |  18 +-
 .../mine/settings/agreement/index.vue         |  13 +-
 src/subPages/mine/settings/index.vue          | 211 ---------------
 src/subPages/mine/settings/network/index.vue  |  51 +---
 src/subPages/mine/settings/privacy/index.vue  |  13 +-
 src/subPages/mine/settings/theme/index.vue    |  57 ++--
 src/subPages/work/components/custom-tree.vue  |   6 +-
 src/subPages/work/config/index.vue            |  24 +-
 src/subPages/work/dept/index.vue              |  35 +--
 src/subPages/work/dict/index.vue              |  24 +-
 src/subPages/work/dict/item/index.vue         |  28 +-
 src/subPages/work/log/index.vue               |  21 +-
 src/subPages/work/menu/index.vue              |  19 +-
 src/subPages/work/notice/index.vue            |  30 +--
 src/subPages/work/role/assign-perm/index.vue  |  16 +-
 src/subPages/work/role/index.vue              |  26 +-
 src/subPages/work/user/index.vue              |  82 ++++--
 src/theme.json                                |   4 +-
 src/types/global.d.ts                         |   4 +-
 src/utils/auth.ts                             |  15 +-
 src/utils/{index.ts => error.ts}              |   2 +-
 src/utils/form-schema.ts                      |  80 ++++++
 src/utils/form.ts                             |  36 ---
 src/utils/permission.ts                       |   2 +-
 src/utils/request.ts                          |  24 +-
 src/utils/storage.ts                          |  56 ++++
 unocss.config.ts                              |  16 +-
 83 files changed, 1517 insertions(+), 1780 deletions(-)
 delete mode 100644 .cursorrules
 create mode 100644 src/composables/useCacheCleaner.ts
 create mode 100644 src/composables/useLogout.ts
 rename src/composables/{useSmsCode.ts => useSmsLoginCode.ts} (51%)
 rename src/config/{menu.ts => work-menu.ts} (94%)
 create mode 100644 src/constants/permissions.ts
 create mode 100644 src/constants/storage-keys.ts
 delete mode 100644 src/static/icons/git.svg
 rename src/static/icons/{tree.svg => menu.svg} (60%)
 create mode 100644 src/static/icons/repo.svg
 delete mode 100644 src/subPages/mine/settings/index.vue
 rename src/utils/{index.ts => error.ts} (99%)
 create mode 100644 src/utils/form-schema.ts
 delete mode 100644 src/utils/form.ts

diff --git a/.cursorrules b/.cursorrules
deleted file mode 100644
index 4f52b82..0000000
--- a/.cursorrules
+++ /dev/null
@@ -1,99 +0,0 @@
-## 样式（CSS/SCSS）与 UnoCSS 使用规范（Cursor Rules）
-
-目标：在不牺牲可读性的前提下最大化复用，减少冗余，保证小程序/H5 多端一致、整洁大方。
-
-### 1) 总原则
-- 优先使用 UnoCSS 工具类与已定义的 shortcuts，避免重复造轮子。
-- 同一工具类组合在同一页面或多个页面中出现 ≥ 2 次时，提取为“语义化类名”。
-- 禁止使用 `@apply`，禁止在 SCSS 中重复定义 UnoCSS 已提供的工具类或在 `unocss.config.ts` 中已存在的 shortcuts（如：`flex`、`flex-start`、`flex-between`、`flex-col-center` 等）。
-- 组件库样式覆盖和页面布局样式分离：页面/组件的布局与样式用普通类，覆盖 wot 组件样式用“外部样式类”。
-
-### 2) 目录与作用域
-- 页面私有样式：写在当前 `.vue` 的 `<style lang="scss" scoped>` 中。
-- 多处复用的语义化样式：优先抽到所属页面/模块级样式；跨页面复用再考虑提到 `src/styles` 公共样式文件。
-- 避免把零碎的、只出现一次的样式放到全局，保持全局样式轻量。
-
-### 3) 覆盖 wot-design-uni 组件样式（外部样式类）
-- 使用 `custom-class` 传入类名，禁止对 wot 组件使用 `class` 覆盖样式。
-- 因为 SFC `scoped`，覆盖子组件需使用 `:deep()`，并加 `!important` 提升优先级。
-- 在“自定义组件”中使用 wot 组件时，若样式穿透无效，按需开启 `styleIsolation: 'shared'`。
-- 参考文档：[小程序使用外部样式类（wot-design-uni）](https://wot-design-uni.pages.dev/guide/common-problems.html#%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BD%BF%E7%94%A8%E5%A4%96%E9%83%A8%E6%A0%B7%E5%BC%8F%E7%B1%BB)
-
-示例（按钮）：
-
-```vue
-<wd-button custom-class="logout-button" plain @click="handleLogout">退出登录</wd-button>
-```
-
-```scss
-/* 页面/组件内 */
-:deep(.logout-button) {
-  width: 100% !important;
-  height: 80rpx !important;
-  font-size: 32rpx !important;
-  font-weight: bold !important;
-  border-radius: 40rpx !important;
-}
-```
-
-### 4) UnoCSS 约定与最小用法
-- 预设、shortcuts 位于 `unocss.config.ts`，不要在 SCSS 中重复定义这些类。
-- 常用 shortcuts（已存在，无需再自定义）：
-  - `flex-start`、`flex-between`、`flex-center`、`flex-col-center` 等。
-- 可以自由组合 UnoCSS 工具类（如：`p-20rpx`、`px-24rpx`、`border-b` 等）。
-- 不可读的长串组合若重复使用，抽成语义化类名。
-- 复杂/冗长的原子类组合（例如包含 ≥4 个原子类，且会在项目内重复出现）一律改为“外部样式类”（语义化类名），以避免模板膨胀；模板仅保留必要的少量工具类。
- - 简单、一次性且语义明确的区域优先使用 UnoCSS 原子类（例如单个 `p-30rpx`、`text-center`、`font-600` 等）；
-   复杂/冗长（≥4）或会复用的组合抽为“外部样式类”。
-
-示例（页面语义化类）：
-
-```vue
-<view class="card-header">...</view>
-```
-
-```scss
-.card-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 20rpx 24rpx;
-  border-bottom: 1rpx solid #e5e7eb;
-}
-
-:deep(.dark) .card-header { border-bottom-color: #374151; }
-```
-
-### 5) 语义化抽取的判定标准
-- 满足以下任一条件即可抽取为语义化类名：
-  - 同一工具类组合在项目内出现 ≥ 2 次；
-  - 该区域具备明确的语义（如“卡片头部”、“工具项”等）；
-  - 需要在暗色模式等主题下统一控制样式。
-
-推荐命名：`kebab-case`，表达语义而非表现形式，例如：`card-header`、`tool-item`、`user-profile`。
-
-### 6) 属性书写顺序（遵循项目 Linter）
-- 基本顺序：`display` → 布局（如 `flex-*`：先 `align-items`，后 `justify-content`）→ 尺寸（`width/height`）→ 间距（`margin/padding`）→ 背景 → 边框 → 圆角 → 阴影 → 过渡/变换。
-- 避免无意义的属性覆盖；必要时使用 `!important`，仅用于外部样式类覆盖。
-
-### 7) 深色模式
-- 使用 `:deep(.dark) .your-class { ... }` 定义暗色样式，保持与明亮模式同一语义类名。
-
-### 8) 示例对照（本项目中已落地）
-- 将重复的工具项组合 `w-1/4 flex-col-center mb-30rpx` 抽取为：
-  - `tool-item`（语义化类，含列方向与对齐、宽度 25%、下间距）
-- 将重复的卡片头部组合 `flex-between p-20rpx px-24rpx border-b ...` 抽取为：
-  - `card-header`（统一控制边距、分隔线与暗色模式）
-- 将数据统计卡片 `flex p-30rpx mx-30rpx my-20rpx bg-white rounded-16rpx shadow-sm dark:bg-gray-800` 抽取为：
-  - `stats-card`、`stats-item`、`stats-divider`（统一控制布局/间距/暗色色板）
-- 覆盖 wot 组件样式：
-  - 使用 `custom-class` + `:deep()` + `!important`，不要用 `class`。
-
-### 9) 禁止项（务必遵守）
-- 不要在 SCSS 中定义 `.flex`、`.flex-start`、`.flex-between` 等已由 UnoCSS/shortcuts 提供的类。
-- 不要再使用 `@apply`。
-- 不要把一次性的样式放到全局公共样式。
-
----
-本规则文件旨在为 Cursor 自动补全与协作提供统一参考，遇到冲突以项目 Lint 规则与 `unocss.config.ts` 为准。
-
diff --git a/.gitattributes b/.gitattributes
index 991c302..c99ceab 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,27 +1,2 @@
-# Auto detect text files and perform LF normalization
+# 统一文本文件换行符为 LF（跨平台协作避免 CRLF 混入）
 * text=auto eol=lf
-
-# Source files
-*.ts text eol=lf
-*.tsx text eol=lf
-*.js text eol=lf
-*.jsx text eol=lf
-*.vue text eol=lf
-*.mjs text eol=lf
-*.cjs text eol=lf
-
-# Config files
-*.json text eol=lf
-*.yml text eol=lf
-*.yaml text eol=lf
-
-# Styling
-*.css text eol=lf
-*.scss text eol=lf
-*.less text eol=lf
-
-# Documentation
-*.md text eol=lf
-
-# Shell scripts
-*.sh text eol=lf
diff --git a/.gitignore b/.gitignore
index a1a9a24..f643720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
+.pnpm-store
 .DS_Store
 dist
 *.local
diff --git a/LICENSE b/LICENSE
index 5b3357a..d524820 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024-present 郝先瑞
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024-present 郝先瑞
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 6b2d005..97e8193 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -44,7 +44,7 @@ export default [
         ...{
           uni: "readonly", // uni-app 全局对象
           UniApp: "readonly", // uni-app 全局对象
-          ResponseData: "readonly", // 统一响应数据类型
+          ApiResponse: "readonly", // 统一响应数据类型
           PageResult: "readonly", // 分页结果数据类型
           PageQuery: "readonly", // 分页查询数据类型
           OptionType: "readonly", // 选项类型
diff --git a/package.json b/package.json
index 3133525..298009a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "youlai-app",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "scripts": {
     "dev:app": "uni -p app",
     "dev:app-android": "uni -p app-android",
diff --git a/src/api/auth.ts b/src/api/auth.ts
index fc05035..4666c7c 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 const AUTH_BASE_URL = "/api/v1/auth";
 const WXMA_AUTH_BASE_URL = "/api/v1/wxma/auth";
 
-export interface LoginData {
+export interface PasswordLoginParams {
   username: string;
   password: string;
   captchaId?: string;
@@ -25,12 +25,12 @@ export interface Captcha {
   captchaBase64: string;
 }
 
-export interface SmsLoginData {
+export interface SmsLoginParams {
   mobile: string;
   code: string;
 }
 
-export interface WxMaLoginResp {
+export interface WxMaLoginResult {
   accessToken?: string;
   refreshToken?: string;
   tokenType?: string;
@@ -40,12 +40,12 @@ export interface WxMaLoginResp {
   openid?: string;
 }
 
-export interface WxMaPhoneLoginData {
+export interface WxMaPhoneLoginParams {
   loginCode: string;
   phoneCode: string;
 }
 
-export interface WxMaBindMobileData {
+export interface WxMaBindMobileParams {
   openid: string;
   mobile: string;
   smsCode: string;
@@ -71,7 +71,7 @@ const AuthAPI = {
   },
 
   /** 账号密码登录 */
-  login(data: LoginData): Promise<LoginResult> {
+  loginByPassword(data: PasswordLoginParams): Promise<LoginResult> {
     return request<LoginResult>({
       url: `${AUTH_BASE_URL}/login`,
       method: "POST",
@@ -93,7 +93,7 @@ const AuthAPI = {
   },
 
   /** 短信验证码登录 */
-  loginBySms(data: SmsLoginData): Promise<LoginResult> {
+  loginBySms(data: SmsLoginParams): Promise<LoginResult> {
     const mobileSafe = encodeURIComponent(data.mobile);
     const codeSafe = encodeURIComponent(data.code);
     return request<LoginResult>({
@@ -109,8 +109,8 @@ const AuthAPI = {
    * - 已绑定手机号的用户：直接返回 token，登录成功
    * - 未绑定手机号的用户：返回 openid，需调用绑定手机号接口
    */
-  wxMaSilentLogin(code: string): Promise<WxMaLoginResp> {
-    return request<WxMaLoginResp>({
+  wxMaSilentLogin(code: string): Promise<WxMaLoginResult> {
+    return request<WxMaLoginResult>({
       url: `${WXMA_AUTH_BASE_URL}/silent-login?code=${encodeURIComponent(code)}`,
       method: "POST",
     });
@@ -122,7 +122,7 @@ const AuthAPI = {
    * 适用场景：企业认证小程序（已开通手机号快捷登录权限）
    * 一步完成登录，无需绑定流程，自动创建新用户
    */
-  wxMaPhoneLogin(data: WxMaPhoneLoginData): Promise<LoginResult> {
+  wxMaPhoneLogin(data: WxMaPhoneLoginParams): Promise<LoginResult> {
     return request<LoginResult>({
       url: `${WXMA_AUTH_BASE_URL}/phone-login`,
       method: "POST",
@@ -135,7 +135,7 @@ const AuthAPI = {
    *
    * 演示环境说明：短信服务未配置，验证码固定为 123456
    */
-  wxMaBindMobile(data: WxMaBindMobileData): Promise<LoginResult> {
+  wxMaBindMobile(data: WxMaBindMobileParams): Promise<LoginResult> {
     return request<LoginResult>({
       url: `${WXMA_AUTH_BASE_URL}/bind-mobile`,
       method: "POST",
@@ -158,7 +158,7 @@ const AuthAPI = {
    *
    * 把当前 APP 登录用户与票据绑定，PC 端 status 随即进入 SCANNED 并展示头像昵称
    */
-  qrScan(ticket: string): Promise<QrCodeScanResult> {
+  markQrLoginScanned(ticket: string): Promise<QrCodeScanResult> {
     return request<QrCodeScanResult>({
       url: `${AUTH_BASE_URL}/qr-code/scan`,
       method: "POST",
@@ -167,11 +167,11 @@ const AuthAPI = {
   },
 
   /**
-   * 确认登录
+   * 确认扫码登录
    *
    * 真正的授权动作，授权后 PC 端 status 进入 CONFIRMED，可换取会话令牌
    */
-  qrConfirm(ticket: string): Promise<QrCodeScanResult> {
+  confirmQrLogin(ticket: string): Promise<QrCodeScanResult> {
     return request<QrCodeScanResult>({
       url: `${AUTH_BASE_URL}/qr-code/confirm`,
       method: "POST",
@@ -180,11 +180,11 @@ const AuthAPI = {
   },
 
   /**
-   * 取消登录
+   * 取消扫码登录
    *
    * 撤回本次扫码，PC 端 status 进入 CANCELED
    */
-  qrCancel(ticket: string): Promise<QrCodeScanResult> {
+  cancelQrLogin(ticket: string): Promise<QrCodeScanResult> {
     return request<QrCodeScanResult>({
       url: `${AUTH_BASE_URL}/qr-code/cancel`,
       method: "POST",
diff --git a/src/api/dict.ts b/src/api/dict.ts
index cec9769..395ec77 100644
--- a/src/api/dict.ts
+++ b/src/api/dict.ts
@@ -52,7 +52,7 @@ const DictAPI = {
 
   /** 获取字典数据分页列表 */
   getItemPage(dictCode: string, queryParams: DictItemPageQuery) {
-    return request<PageResult<DictDataItem>>({
+    return request<PageResult<DictItem>>({
       url: `${DICT_BASE_URL}/${dictCode}/items`,
       method: "GET",
       data: queryParams,
@@ -141,7 +141,7 @@ export interface DictItemForm {
 }
 
 /** 字典数据分页对象 */
-export interface DictDataItem {
+export interface DictItem {
   id?: string;
   dictCode?: string;
   label?: string;
diff --git a/src/api/file.ts b/src/api/file.ts
index 129e5ef..65daf30 100644
--- a/src/api/file.ts
+++ b/src/api/file.ts
@@ -30,9 +30,9 @@ const FileAPI = {
         },
         formData: {},
         success: (response) => {
-          let resData: ResponseData<FileInfo>;
+          let resData: ApiResponse<FileInfo>;
           try {
-            resData = JSON.parse(response.data) as ResponseData<FileInfo>;
+            resData = JSON.parse(response.data) as ApiResponse<FileInfo>;
           } catch {
             reject(new RequestError("文件上传响应解析失败", response.statusCode));
             return;
diff --git a/src/api/role.ts b/src/api/role.ts
index be7027a..fb105be 100644
--- a/src/api/role.ts
+++ b/src/api/role.ts
@@ -21,7 +21,7 @@ const RoleAPI = {
   },
 
   /** 获取角色的菜单ID集合 */
-  getRoleMenuIds(roleId: number) {
+  getMenuIds(roleId: number) {
     return request<number[]>({
       url: `${ROLE_BASE_URL}/${roleId}/menu-ids`,
       method: "GET",
@@ -29,11 +29,11 @@ const RoleAPI = {
   },
 
   /** 分配菜单权限 */
-  updateRoleMenus(roleId: number, data: number[]) {
+  assignMenus(roleId: number, menuIds: number[]) {
     return request({
       url: `${ROLE_BASE_URL}/${roleId}/menus`,
       method: "PUT",
-      data: data,
+      data: menuIds,
     });
   },
 
diff --git a/src/api/user.ts b/src/api/user.ts
index 270a3f1..3b4df78 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -4,7 +4,7 @@ const USER_BASE_URL = "/api/v1/users";
 
 const UserAPI = {
   /** 获取当前登录用户信息 */
-  getUserInfo(): Promise<UserInfo> {
+  getCurrentUser(): Promise<UserInfo> {
     return request<UserInfo>({
       url: `${USER_BASE_URL}/me`,
       method: "GET",
diff --git a/src/components/app-provider/index.vue b/src/components/app-provider/index.vue
index fe363ab..fe31b68 100644
--- a/src/components/app-provider/index.vue
+++ b/src/components/app-provider/index.vue
@@ -5,17 +5,28 @@ import { useThemeStore } from "@/store";
 /**
  * 全局应用容器（主题配置唯一来源）
  *
- * wd-config-provider 自身会渲染 wot-theme-{light|dark} 类，并把 themeVars
- * 全量映射为 --wot-* 内联变量，页面内容与全局弹层（notify/toast/dialog）
- * 统一从这里继承主题。default 与 tabbar 两个 layout 共用，保证配置同源。
+ * 页面内容与全局弹层（notify/toast/dialog）统一从 wd-config-provider 继承主题，
+ * default / tabbar 两个 layout 共用，保证配置同源。
  */
 const themeStore = useThemeStore();
-const { theme, themeVars } = storeToRefs(themeStore);
+const { themeMode, themeVars } = storeToRefs(themeStore);
 
-// 主题色双通道同步：themeVars 只覆盖 --wot-* 组件变量，页面自定义样式的
-// var(--color-primary) 依赖这里内联注入跟随用户选中色，否则换色时两套蓝割裂
-// （wot v2 的 customStyle 为字符串拼接，不接受对象）
-const providerStyle = computed(() => `--color-primary: ${themeStore.currentThemeColor.primary};`);
+// 页面自定义样式用的主题色（含透明度变体）与深色模式下的卡片填充色
+const HEX6_RE = /^#[0-9a-fA-F]{6}$/;
+
+const providerStyle = computed(() => {
+  const primary = themeStore.selectedThemeColor.primary;
+  const styles = [`--color-primary: ${primary}`, "--wot-filled-oppo: var(--color-bg-card)"];
+  if (HEX6_RE.test(primary)) {
+    const bigint = Number.parseInt(primary.slice(1), 16);
+    const rgb = `${(bigint >> 16) & 255}, ${(bigint >> 8) & 255}, ${bigint & 255}`;
+    styles.push(
+      `--color-primary-alpha-20: rgba(${rgb}, 0.2)`,
+      `--color-primary-alpha-15: rgba(${rgb}, 0.15)`
+    );
+  }
+  return styles.join("; ");
+});
 </script>
 
 <script lang="ts">
@@ -30,7 +41,7 @@ export default {
 
 <template>
   <wd-config-provider
-    :theme="theme"
+    :theme="themeMode"
     :theme-vars="themeVars"
     :custom-style="providerStyle"
     :button="{ type: 'primary' }"
diff --git a/src/components/custom-navbar/index.vue b/src/components/custom-navbar/index.vue
index 9767fc5..b7c06a0 100644
--- a/src/components/custom-navbar/index.vue
+++ b/src/components/custom-navbar/index.vue
@@ -6,7 +6,7 @@
     :style="{
       height: totalHeight + 'px',
       paddingTop: statusBarHeight + 'px',
-      backgroundColor: bgColor,
+      background: bgColor,
     }"
   >
     <view class="custom-navbar__content" :style="{ height: contentHeight + 'px' }">
@@ -45,6 +45,7 @@ import { useNavbar } from "@/composables/useNavbar";
 interface Props {
   title?: string;
   titleColor?: string;
+  /** 背景色或渐变，取值同 background 简写属性 */
   bgColor?: string;
   showBack?: boolean;
   showHome?: boolean;
@@ -59,7 +60,7 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), {
   title: "",
   titleColor: "var(--color-text)",
-  bgColor: "var(--color-bg)",
+  bgColor: "var(--color-bg-card)",
   showBack: true,
   showHome: false,
   backIcon: "arrow-left",
@@ -153,7 +154,7 @@ export default {
   position: relative;
   z-index: var(--z-navbar);
   box-sizing: border-box;
-  background-color: var(--color-bg);
+  background-color: var(--color-bg-card);
 
   &--fixed {
     position: fixed;
@@ -189,7 +190,7 @@ export default {
   border-radius: 50%;
 
   &:active {
-    background-color: rgba(0, 0, 0, 0.05);
+    background-color: var(--color-fill-2);
   }
 }
 
diff --git a/src/components/qiun-data-charts/qiun-data-charts.vue b/src/components/qiun-data-charts/qiun-data-charts.vue
index c1fbfb7..9ac2dab 100644
--- a/src/components/qiun-data-charts/qiun-data-charts.vue
+++ b/src/components/qiun-data-charts/qiun-data-charts.vue
@@ -556,21 +556,24 @@ export default {
       }
       this.cid = id;
     }
-    const systemInfo = uni.getSystemInfoSync();
-    if (systemInfo.platform === "windows" || systemInfo.platform === "mac") {
+    const deviceInfo =
+      typeof uni.getDeviceInfo === "function" ? uni.getDeviceInfo() : uni.getSystemInfoSync();
+    const windowInfo =
+      typeof uni.getWindowInfo === "function" ? uni.getWindowInfo() : uni.getSystemInfoSync();
+    if (deviceInfo.platform === "windows" || deviceInfo.platform === "mac") {
       this.inWin = true;
     }
     // #ifdef MP-WEIXIN
     this.inWx = true;
     if (
       this.canvas2d === false ||
-      systemInfo.platform === "windows" ||
-      systemInfo.platform === "mac"
+      deviceInfo.platform === "windows" ||
+      deviceInfo.platform === "mac"
     ) {
       this.type2d = false;
     } else {
       this.type2d = true;
-      this.pixel = systemInfo.pixelRatio;
+      this.pixel = windowInfo.pixelRatio;
     }
     // #endif
     //非微信小程序端强制关闭canvas2d模式
@@ -585,7 +588,7 @@ export default {
     // #endif
     // #ifdef MP-ALIPAY
     this.inAli = true;
-    this.pixel = systemInfo.pixelRatio;
+    this.pixel = windowInfo.pixelRatio;
     // #endif
     // #ifdef MP-BAIDU
     this.inBd = true;
diff --git a/src/components/qiun-loading/loading1.vue b/src/components/qiun-loading/loading1.vue
index ea6034b..42270b7 100644
--- a/src/components/qiun-loading/loading1.vue
+++ b/src/components/qiun-loading/loading1.vue
@@ -35,20 +35,20 @@ export default {
 }
 .container .shape.shape1 {
   left: 0;
-  background-color: #1890ff;
+  background-color: var(--color-primary);
 }
 .container .shape.shape2 {
   right: 0;
-  background-color: #91cb74;
+  background-color: var(--color-success);
 }
 .container .shape.shape3 {
   bottom: 0;
-  background-color: #fac858;
+  background-color: var(--color-warning);
 }
 .container .shape.shape4 {
   right: 0;
   bottom: 0;
-  background-color: #ee6666;
+  background-color: var(--color-danger);
 }
 
 .loading1 .shape1 {
diff --git a/src/components/qiun-loading/loading2.vue b/src/components/qiun-loading/loading2.vue
index a22a3da..d563bf8 100644
--- a/src/components/qiun-loading/loading2.vue
+++ b/src/components/qiun-loading/loading2.vue
@@ -41,20 +41,20 @@ export default {
 }
 .container .shape.shape1 {
   left: 0;
-  background-color: #1890ff;
+  background-color: var(--color-primary);
 }
 .container .shape.shape2 {
   right: 0;
-  background-color: #91cb74;
+  background-color: var(--color-success);
 }
 .container .shape.shape3 {
   bottom: 0;
-  background-color: #fac858;
+  background-color: var(--color-warning);
 }
 .container .shape.shape4 {
   right: 0;
   bottom: 0;
-  background-color: #ee6666;
+  background-color: var(--color-danger);
 }
 
 .loading2 .shape1 {
diff --git a/src/components/qiun-loading/loading3.vue b/src/components/qiun-loading/loading3.vue
index 91ce4bd..858ab76 100644
--- a/src/components/qiun-loading/loading3.vue
+++ b/src/components/qiun-loading/loading3.vue
@@ -48,20 +48,20 @@ export default {
 }
 .container .shape.shape1 {
   left: 0;
-  background-color: #1890ff;
+  background-color: var(--color-primary);
 }
 .container .shape.shape2 {
   right: 0;
-  background-color: #91cb74;
+  background-color: var(--color-success);
 }
 .container .shape.shape3 {
   bottom: 0;
-  background-color: #fac858;
+  background-color: var(--color-warning);
 }
 .container .shape.shape4 {
   right: 0;
   bottom: 0;
-  background-color: #ee6666;
+  background-color: var(--color-danger);
 }
 
 .loading3 .shape1 {
diff --git a/src/components/qiun-loading/loading4.vue b/src/components/qiun-loading/loading4.vue
index 1722252..d29a8a2 100644
--- a/src/components/qiun-loading/loading4.vue
+++ b/src/components/qiun-loading/loading4.vue
@@ -36,20 +36,20 @@ export default {
 }
 .container .shape.shape1 {
   left: 0;
-  background-color: #1890ff;
+  background-color: var(--color-primary);
 }
 .container .shape.shape2 {
   right: 0;
-  background-color: #91cb74;
+  background-color: var(--color-success);
 }
 .container .shape.shape3 {
   bottom: 0;
-  background-color: #fac858;
+  background-color: var(--color-warning);
 }
 .container .shape.shape4 {
   right: 0;
   bottom: 0;
-  background-color: #ee6666;
+  background-color: var(--color-danger);
 }
 
 .loading5 .shape1 {
diff --git a/src/components/qiun-loading/loading5.vue b/src/components/qiun-loading/loading5.vue
index bade61c..5cf3966 100644
--- a/src/components/qiun-loading/loading5.vue
+++ b/src/components/qiun-loading/loading5.vue
@@ -39,20 +39,20 @@ export default {
 }
 .container .shape.shape1 {
   left: 0;
-  background-color: #1890ff;
+  background-color: var(--color-primary);
 }
 .container .shape.shape2 {
   right: 0;
-  background-color: #91cb74;
+  background-color: var(--color-success);
 }
 .container .shape.shape3 {
   bottom: 0;
-  background-color: #fac858;
+  background-color: var(--color-warning);
 }
 .container .shape.shape4 {
   right: 0;
   bottom: 0;
-  background-color: #ee6666;
+  background-color: var(--color-danger);
 }
 
 .loading6 .shape1 {
diff --git a/src/composables/useCacheCleaner.ts b/src/composables/useCacheCleaner.ts
new file mode 100644
index 0000000..78552e3
--- /dev/null
+++ b/src/composables/useCacheCleaner.ts
@@ -0,0 +1,55 @@
+import { ref } from "vue";
+import { useToast } from "@wot-ui/ui";
+import { Storage } from "@/utils/storage";
+import { formatBytes } from "@/utils/format";
+
+/**
+ * 缓存体积与清理
+ *
+ * 只统计并清理可重建的缓存（如用户信息缓存），登录态与主题偏好不参与，
+ * 避免像 uni.clearStorage() 那样把 token 一起清掉导致下次启动退出登录。
+ */
+export function useCacheCleaner() {
+  const toast = useToast();
+  const usageText = ref("计算中...");
+  const isClearing = ref(false);
+
+  async function loadUsage() {
+    try {
+      usageText.value = formatBytes(Storage.getClearableBytes());
+    } catch {
+      usageText.value = "获取失败";
+    }
+  }
+
+  async function clear() {
+    if (usageText.value === "获取失败") {
+      toast.info("获取缓存信息失败，请稍后重试");
+      return;
+    }
+    if (isClearing.value) {
+      return;
+    }
+    if (usageText.value === "0B") {
+      toast.info("暂无缓存需要清理");
+      return;
+    }
+
+    try {
+      isClearing.value = true;
+      const removed = Storage.clearCache();
+      await loadUsage();
+      if (removed > 0) {
+        toast.success("清理成功");
+      } else {
+        toast.info("暂无缓存需要清理");
+      }
+    } catch {
+      toast.error("清理失败");
+    } finally {
+      isClearing.value = false;
+    }
+  }
+
+  return { usageText, isClearing, loadUsage, clear };
+}
diff --git a/src/composables/useCountdown.ts b/src/composables/useCountdown.ts
index 17d304e..e1e8eef 100644
--- a/src/composables/useCountdown.ts
+++ b/src/composables/useCountdown.ts
@@ -1,22 +1,27 @@
 import { ref, onUnmounted } from "vue";
 
+/**
+ * 倒计时（按截止时间计算剩余秒数，页面隐藏或切后台后恢复时仍保持准确）
+ */
 export function useCountdown(duration = 60) {
   const countdown = ref(0);
   const isRunning = ref(false);
   let timer: ReturnType<typeof setInterval> | null = null;
+  let deadline = 0;
+
+  function tick() {
+    const remain = Math.ceil((deadline - Date.now()) / 1000);
+    countdown.value = Math.max(0, remain);
+    if (countdown.value <= 0) stop();
+  }
 
   const start = () => {
     if (isRunning.value) return;
 
-    countdown.value = duration;
+    deadline = Date.now() + duration * 1000;
     isRunning.value = true;
-
-    timer = setInterval(() => {
-      countdown.value--;
-      if (countdown.value <= 0) {
-        stop();
-      }
-    }, 1000);
+    tick();
+    timer = setInterval(tick, 1000);
   };
 
   const stop = () => {
diff --git a/src/composables/useLogout.ts b/src/composables/useLogout.ts
new file mode 100644
index 0000000..2419ad5
--- /dev/null
+++ b/src/composables/useLogout.ts
@@ -0,0 +1,22 @@
+import { useUserStore } from "@/store";
+
+/** 退出登录二次确认，确认后由 userStore.logout 清理会话并跳转登录页 */
+export function useLogout() {
+  const userStore = useUserStore();
+
+  // 取消不做处理，确认后交给 logout 统一收尾
+  const confirmLogout = () => {
+    uni.showModal({
+      title: "提示",
+      content: "确定要退出登录吗？",
+      confirmColor: "#f53f3f",
+      success: async (res) => {
+        if (res.confirm) {
+          await userStore.logout();
+        }
+      },
+    });
+  };
+
+  return { confirmLogout };
+}
diff --git a/src/composables/useNavbar.ts b/src/composables/useNavbar.ts
index 5248a09..750e7a4 100644
--- a/src/composables/useNavbar.ts
+++ b/src/composables/useNavbar.ts
@@ -7,7 +7,7 @@ import { ref, computed, type Ref, type ComputedRef } from "vue";
  *
  * 重要说明：
  * 1. CSS 变量 --status-bar-height 在某些情况下不准确（小程序端固定 25px）
- * 2. 推荐使用 uni.getSystemInfoSync().statusBarHeight 动态获取
+ * 2. 使用 uni.getWindowInfo().statusBarHeight 动态获取
  * 3. 微信小程序需要考虑胶囊按钮位置
  * 4. H5 没有状态栏，statusBarHeight 为 0
  *
@@ -197,12 +197,15 @@ export function useNavbar(options: UseNavbarOptions = {}): UseNavbarReturn {
   // 初始化
   const init = () => {
     try {
-      const systemInfo = uni.getSystemInfoSync();
+      const windowInfo =
+        typeof uni.getWindowInfo === "function" ? uni.getWindowInfo() : uni.getSystemInfoSync();
+      const deviceInfo =
+        typeof uni.getDeviceInfo === "function" ? uni.getDeviceInfo() : uni.getSystemInfoSync();
 
-      statusBarHeight.value = systemInfo.statusBarHeight || 0;
-      safeAreaBottom.value = systemInfo.safeAreaInsets?.bottom || 0;
-      windowWidth.value = systemInfo.windowWidth || 375;
-      platform.value = systemInfo.platform || "";
+      statusBarHeight.value = windowInfo.statusBarHeight || 0;
+      safeAreaBottom.value = windowInfo.safeAreaInsets?.bottom || 0;
+      windowWidth.value = windowInfo.windowWidth || 375;
+      platform.value = deviceInfo.platform || "";
 
       // #ifdef MP-WEIXIN
       // 微信小程序：获取胶囊按钮位置
diff --git a/src/composables/usePagedList.ts b/src/composables/usePagedList.ts
index 7afecd5..83731cf 100644
--- a/src/composables/usePagedList.ts
+++ b/src/composables/usePagedList.ts
@@ -4,65 +4,96 @@ import { onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
 /**
  * 分页列表统一逻辑：触底加载 + 下拉刷新
  *
- * fetcher 返回一页数据；pageNum 的推进与回退全部由这里维护，页面只消费
- * pageData / total / loadMoreState 三个状态。
+ * 页面只维护业务筛选条件；页码推进、加载状态和列表数据全部由这里接管。
+ * 每次请求前对筛选条件做快照，并携带请求序号：快速切换搜索条件时，
+ * 旧请求的晚到响应会被直接丢弃，不会覆盖新条件的结果。
  *
- * const { pageData, total, loadMoreState, reload } = usePagedList(UserAPI.getPage, queryParams);
+ * 底部状态 loadMoreState 的含义：
+ * - loading：任一请求进行中
+ * - error：最近一次请求失败（点击可重试当前失败页）
+ * - finished：已加载全部数据（底部显示"没有更多了"）
+ * - idle：无底部指示（空列表或还有下一页待触底）
+ *
+ * const { items, total, loadMoreState, reload, retry } = usePagedList(UserAPI.getPage, queryParams);
  */
 export function usePagedList<T, Q extends { pageNum: number; pageSize: number }>(
   fetcher: (query: Q) => Promise<{ list: T[]; total: number }>,
   queryParams: Q
 ) {
   const total = ref(0);
-  const pageData = ref<T[]>([]) as Ref<T[]>;
-  const loadMoreState = ref<"loading" | "finished" | "error">("loading");
+  const items = ref<T[]>([]) as Ref<T[]>;
+  const loadMoreState = ref<"loading" | "error" | "finished" | "idle">("loading");
 
-  /** 拉取当前 pageNum 指向的一页（成功后 pageNum 前进）；append 为触底追加，否则整体替换 */
-  function fetchPage(append: boolean) {
+  /** 已成功加载的页数，下一页 = loadedPages + 1 */
+  let loadedPages = 0;
+  /** 请求序号：序号不匹配的响应一律丢弃 */
+  let requestSeq = 0;
+  /** 最近一次请求的目标页与写入方式，供失败重试 */
+  let lastAttempt: { page: number; append: boolean } | null = null;
+
+  /** 组装第 page 页的请求参数：快照 + 页码，避免请求期间筛选对象继续变化 */
+  function buildQuery(page: number): Q {
+    return { ...queryParams, pageNum: page };
+  }
+
+  /** 已加载数量是否小于总数 */
+  function hasMore(): boolean {
+    return items.value.length < total.value;
+  }
+
+  /**
+   * 拉取第 page 页；append 为触底追加，否则整体替换（首次加载/重新搜索）
+   * keepOnFail 为 true 时（下拉刷新）失败保留现有数据，否则替换失败清空列表展示错误态
+   */
+  async function fetchPage(page: number, append: boolean, keepOnFail = false): Promise<void> {
+    const seq = ++requestSeq;
+    lastAttempt = { page, append };
     loadMoreState.value = "loading";
-    fetcher(queryParams)
-      .then((data) => {
-        pageData.value = append ? [...pageData.value, ...data.list] : data.list;
-        total.value = data.total;
-        queryParams.pageNum++;
-        loadMoreState.value = "finished";
-      })
-      .catch(() => {
-        if (!append) pageData.value = [];
-        loadMoreState.value = "error";
-      });
+    try {
+      const data = await fetcher(buildQuery(page));
+      if (seq !== requestSeq) return; // 过期响应：已被更新的请求接管
+      items.value = append ? [...items.value, ...data.list] : data.list;
+      total.value = data.total;
+      loadedPages = page;
+      loadMoreState.value = items.value.length === 0 || hasMore() ? "idle" : "finished";
+    } catch {
+      if (seq !== requestSeq) return;
+      if (!append && !keepOnFail) {
+        items.value = [];
+        total.value = 0;
+      }
+      loadMoreState.value = "error";
+    }
   }
 
-  /** 回到第一页重新拉取（搜索/筛选/增删改后调用） */
-  function reload() {
-    queryParams.pageNum = 1;
-    fetchPage(false);
+  /** 回到第一页重新拉取（搜索/筛选/增删改后调用），返回 Promise 可等待刷新完成 */
+  async function reload(): Promise<void> {
+    loadedPages = 0;
+    await fetchPage(1, false);
   }
 
-  // 触底加载下一页
+  /** 重试最近一次失败的请求：页码与写入方式保持不变，追加失败保留已有列表 */
+  function retry(): void {
+    if (!lastAttempt) return;
+    fetchPage(lastAttempt.page, lastAttempt.append);
+  }
+
+  // 触底加载下一页：请求进行中不重复触发，防止并发追加
   onReachBottom(() => {
     if (loadMoreState.value === "loading") return;
-    if (queryParams.pageNum * queryParams.pageSize < total.value) {
-      fetchPage(true);
-    } else {
-      loadMoreState.value = "finished";
+    if (hasMore()) {
+      fetchPage(loadedPages + 1, true);
     }
   });
 
-  // 下拉刷新：回到第一页（失败时保留现有数据，展示重试态）
+  // 下拉刷新：回到第一页；失败保留现有数据，请求序号防止与触底请求交叉写入
   onPullDownRefresh(async () => {
     try {
-      const data = await fetcher({ ...queryParams, pageNum: 1 });
-      pageData.value = data.list;
-      total.value = data.total;
-      queryParams.pageNum = 2;
-      loadMoreState.value = "finished";
-    } catch {
-      loadMoreState.value = "error";
+      await fetchPage(1, false, true);
     } finally {
       uni.stopPullDownRefresh();
     }
   });
 
-  return { pageData, total, loadMoreState, reload };
+  return { items, total, loadMoreState, reload, retry };
 }
diff --git a/src/composables/useSmsCode.ts b/src/composables/useSmsLoginCode.ts
similarity index 51%
rename from src/composables/useSmsCode.ts
rename to src/composables/useSmsLoginCode.ts
index 7e32396..b8d62b4 100644
--- a/src/composables/useSmsCode.ts
+++ b/src/composables/useSmsLoginCode.ts
@@ -1,6 +1,7 @@
+import { ref } from "vue";
 import { useToast } from "@wot-ui/ui";
 import { useCountdown } from "@/composables/useCountdown";
-import { getErrorMessage } from "@/utils";
+import { getErrorMessage } from "@/utils/error";
 import AuthAPI from "@/api/auth";
 
 /** 手机号格式校验 */
@@ -9,22 +10,24 @@ export function isValidMobile(mobile: string): boolean {
 }
 
 /**
- * 短信验证码发送（含 60s 倒计时）
+ * 登录短信验证码发送（含 60s 倒计时与发送锁）
  *
- * @param options.sentDelay 发送成功后延时毫秒数，默认 0
- * @returns countdown 剩余秒数、send 发送函数、reset 重置倒计时
+ * @returns countdown 剩余秒数、isSending 发送中标志、sendCode 发送函数、resetCountdown 重置倒计时
  */
-export function useSmsCode() {
+export function useSmsLoginCode() {
   const toast = useToast();
   const { countdown, start, stop } = useCountdown(60);
+  /** 发送中标志：请求返回前阻止重复点击（倒计时在发送成功后才启动） */
+  const isSending = ref(false);
 
   /** 发送验证码，失败提示由这里统一处理 */
-  async function send(mobile: string, fallback = "发送失败"): Promise<boolean> {
-    if (countdown.value > 0) return false;
+  async function sendCode(mobile: string, fallback = "发送失败"): Promise<boolean> {
+    if (isSending.value || countdown.value > 0) return false;
     if (!isValidMobile(mobile)) {
       toast.error("请输入正确的手机号");
       return false;
     }
+    isSending.value = true;
     try {
       await AuthAPI.sendSmsLoginCode(mobile.trim());
       toast.success("验证码已发送");
@@ -33,12 +36,14 @@ export function useSmsCode() {
     } catch (error) {
       toast.error(getErrorMessage(error, fallback));
       return false;
+    } finally {
+      isSending.value = false;
     }
   }
 
-  function reset() {
+  function resetCountdown() {
     stop();
   }
 
-  return { countdown, send, reset };
+  return { countdown, isSending, sendCode, resetCountdown };
 }
diff --git a/src/composables/useTheme.ts b/src/composables/useTheme.ts
index abbd7eb..1b7050d 100644
--- a/src/composables/useTheme.ts
+++ b/src/composables/useTheme.ts
@@ -9,11 +9,18 @@ export function useTheme() {
   const store = useThemeStore();
 
   /**
-   * 切换暗黑模式
-   * @param mode 指定主题模式，不传则自动切换
+   * 设置主题模式
+   * @param mode 目标主题模式
    */
-  function toggleTheme(mode?: ThemeMode) {
-    store.toggleTheme(mode);
+  function setThemeMode(mode: ThemeMode) {
+    store.setThemeMode(mode);
+  }
+
+  /**
+   * 在明暗两种模式间切换
+   */
+  function toggleThemeMode() {
+    store.toggleThemeMode();
   }
 
   /**
@@ -21,7 +28,7 @@ export function useTheme() {
    * @param option 主题色选项
    */
   function setThemeColor(option: ThemeColorOption) {
-    store.setCurrentThemeColor(option);
+    store.setThemeColor(option);
   }
 
   /**
@@ -35,15 +42,16 @@ export function useTheme() {
   // 组件中一般无需再调用 initTheme()
 
   return {
-    theme: computed(() => store.theme),
+    themeMode: computed(() => store.themeMode),
     isDark: computed(() => store.isDark),
-    currentThemeColor: computed(() => store.currentThemeColor),
+    selectedThemeColor: computed(() => store.selectedThemeColor),
     themeVars: store.themeVars,
 
     themeColorOptions,
 
     initTheme,
-    toggleTheme,
+    setThemeMode,
+    toggleThemeMode,
     setThemeColor,
   };
 }
diff --git a/src/config/index.ts b/src/config/index.ts
index 235662f..00d783b 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -2,4 +2,4 @@
  * 配置统一导出
  */
 
-export * from "./menu";
+export * from "./work-menu";
diff --git a/src/config/menu.ts b/src/config/work-menu.ts
similarity index 94%
rename from src/config/menu.ts
rename to src/config/work-menu.ts
index 70637ac..03b3793 100644
--- a/src/config/menu.ts
+++ b/src/config/work-menu.ts
@@ -14,7 +14,7 @@ export interface WorkMenuGroup {
   children: WorkMenuItem[];
 }
 
-export const menuConfig: WorkMenuGroup[] = [
+export const workMenuGroups: WorkMenuGroup[] = [
   {
     title: "系统管理",
     children: [
@@ -49,7 +49,7 @@ export const menuConfig: WorkMenuGroup[] = [
         perm: "sys:dict:list",
       },
       {
-        icon: "/static/icons/tree.svg",
+        icon: "/static/icons/menu.svg",
         title: "菜单管理",
         url: "/subPages/work/menu/index",
         perm: "sys:menu:list",
@@ -90,7 +90,7 @@ export const menuConfig: WorkMenuGroup[] = [
         perm: "",
       },
       {
-        icon: "/static/icons/git.svg",
+        icon: "/static/icons/repo.svg",
         title: "仓库",
         url: "https://atomgit.com/youlai/youlai-app",
         perm: "",
diff --git a/src/constants/index.ts b/src/constants/index.ts
index 667972c..d380f48 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -1,20 +1,5 @@
-/**
- * 常量统一导出
+/**
+ * 常量统一出口：具体定义按领域拆分在同级文件
  */
-
-// 🔐 用户认证相关
-export const ACCESS_TOKEN_KEY = "access_token";
-export const REFRESH_TOKEN_KEY = "refresh_token";
-
-// 📊 用户缓存相关
-export const USER_INFO_KEY = "user_info";
-
-// 🎨 主题相关
-export const THEME_MODE_KEY = "app-theme";
-export const THEME_COLOR_KEY = "app-theme-color";
-
-// 🔑 权限相关
-/** 超级管理员角色标识 */
-export const ROLE_ROOT = "ROOT";
-/** 全部权限标识 */
-export const PERM_ALL = "*:*:*";
+export * from "./storage-keys";
+export * from "./permissions";
diff --git a/src/constants/permissions.ts b/src/constants/permissions.ts
new file mode 100644
index 0000000..ad9de62
--- /dev/null
+++ b/src/constants/permissions.ts
@@ -0,0 +1,9 @@
+/**
+ * 权限相关常量
+ */
+
+/** 超级管理员角色标识 */
+export const ROLE_ROOT = "ROOT";
+
+/** 全部权限标识 */
+export const PERM_ALL = "*:*:*";
diff --git a/src/constants/storage-keys.ts b/src/constants/storage-keys.ts
new file mode 100644
index 0000000..5ab12f4
--- /dev/null
+++ b/src/constants/storage-keys.ts
@@ -0,0 +1,16 @@
+/**
+ * 本地存储键常量
+ *
+ * 注意：修改已发布的键值时需兼容读取旧键并迁移，不能只改字符串
+ */
+
+// 🔐 用户认证相关
+export const ACCESS_TOKEN_KEY = "access_token";
+export const REFRESH_TOKEN_KEY = "refresh_token";
+
+// 📊 用户缓存相关
+export const USER_INFO_KEY = "user_info";
+
+// 🎨 主题相关
+export const THEME_MODE_KEY = "app-theme";
+export const THEME_COLOR_KEY = "app-theme-color";
diff --git a/src/main.ts b/src/main.ts
index 8150b76..6a5c248 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,16 +1,19 @@
-import { createSSRApp } from "vue";
+import { createSSRApp } from "vue";
 import App from "./App.vue";
 
 import "uno.css";
 import "@/styles/index.scss";
 
-import { setupStore } from "@/store";
+import { setupPinia, useUserStore } from "@/store";
+import { setUnauthorizedHandler } from "@/utils/request";
 import router from "./router";
 
 export function createApp() {
   const app = createSSRApp(App);
 
-  setupStore(app);
+  setupPinia(app);
+  // 注册会话失效回调：401 时由 store 统一清理内存与持久化登录态
+  setUnauthorizedHandler(() => useUserStore().resetSession());
   app.use(router);
 
   return {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 74138c1..0080d5b 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,13 +1,18 @@
-<template>
+<template>
   <view>
     <!-- 轮播图 -->
     <view class="relative">
-      <wd-swiper v-model:current="current" custom-class="swiper-box" :list="swiperList" autoplay />
+      <wd-swiper
+        v-model:current="activeSlideIndex"
+        custom-class="swiper-box"
+        :list="swiperList"
+        autoplay
+      />
       <view class="hero-fade"></view>
     </view>
 
     <!-- 快捷导航 -->
-    <view class="section--overlay">
+    <view class="quick-nav-card">
       <wd-grid clickable :column="4">
         <wd-grid-item
           v-for="(item, index) in quickNavList"
@@ -15,77 +20,73 @@
           use-slot
           @click="handleNavClickWithGuard(item)"
         >
-          <view class="nav-item">
-            <image class="nav-item__icon" :src="item.icon" mode="aspectFit" />
-            <text class="nav-item__label">{{ item.title }}</text>
+          <view class="quick-nav-card__item">
+            <image class="quick-nav-card__icon" :src="item.icon" mode="aspectFit" />
+            <text class="quick-nav-card__label">{{ item.title }}</text>
           </view>
         </wd-grid-item>
       </wd-grid>
     </view>
 
     <!-- 通知公告 -->
-    <view class="m-24rpx">
-      <view class="notice-bar" @click="handleNoticeClick">
-        <view class="notice-bar__icon">
-          <wd-icon name="check" size="32rpx" color="var(--color-success)" />
-        </view>
-        <view class="notice-bar__content">
-          <text class="notice-bar__text">{{ noticeText || "暂无通知公告" }}</text>
-        </view>
+    <view class="notice-bar m-24rpx" @click="handleNoticeClick">
+      <view class="notice-bar__icon">
+        <wd-icon name="check" size="32rpx" color="var(--color-success)" />
+      </view>
+      <view class="notice-bar__content">
+        <text class="notice-bar__text">{{ noticeText || "暂无通知公告" }}</text>
       </view>
     </view>
 
     <!-- 数据统计 -->
-    <view class="m-24rpx">
-      <view class="grid grid-cols-2 gap-16rpx">
-        <view class="stat-card stat-card--uv">
-          <image class="stat-card__icon" src="/static/icons/uv.svg" mode="aspectFit" />
-          <view class="stat-card__header">
-            <text class="stat-card__label">访客数</text>
-            <view class="stat-card__dot stat-card__dot--uv"></view>
-          </view>
-          <text class="stat-card__num stat-card__num--uv">
-            {{ visitOverviewData.todayUvCount }}
-          </text>
+    <view class="grid grid-cols-2 gap-16rpx m-24rpx">
+      <view class="stat-card stat-card--uv">
+        <image class="stat-card__icon" src="/static/icons/uv.svg" mode="aspectFit" />
+        <view class="stat-card__header">
+          <text class="stat-card__label">访客数</text>
+          <view class="stat-card__dot"></view>
         </view>
-        <view class="stat-card stat-card--pv">
-          <image class="stat-card__icon" src="/static/icons/pv.svg" mode="aspectFit" />
-          <view class="stat-card__header">
-            <text class="stat-card__label">浏览量</text>
-            <view class="stat-card__dot stat-card__dot--pv"></view>
-          </view>
-          <text class="stat-card__num stat-card__num--pv">
-            {{ visitOverviewData.todayPvCount }}
-          </text>
+        <text class="stat-card__num">{{ visitOverviewData.todayUvCount }}</text>
+      </view>
+      <view class="stat-card">
+        <image class="stat-card__icon" src="/static/icons/pv.svg" mode="aspectFit" />
+        <view class="stat-card__header">
+          <text class="stat-card__label">浏览量</text>
+          <view class="stat-card__dot"></view>
         </view>
+        <text class="stat-card__num">{{ visitOverviewData.todayPvCount }}</text>
       </view>
     </view>
 
     <!-- 访问趋势图表 -->
-    <view class="m-24rpx">
-      <view class="chart-wrapper">
-        <view class="chart-header">
-          <text class="chart-header__title">访问趋势</text>
-          <view class="segment-control">
-            <view
-              class="segment-control__item"
-              :class="{ 'is-active': recentDaysRange === 7 }"
-              @click="switchRange(7)"
-            >
-              近7天
-            </view>
-            <view
-              class="segment-control__item"
-              :class="{ 'is-active': recentDaysRange === 15 }"
-              @click="switchRange(15)"
-            >
-              近15天
-            </view>
+    <view class="chart-wrapper m-24rpx">
+      <view class="chart-wrapper__header">
+        <text class="chart-wrapper__title">访问趋势</text>
+        <view class="segment-control">
+          <view
+            class="segment-control__item"
+            :class="{ 'is-active': trendDays === 7 }"
+            @click="switchRange(7)"
+          >
+            近7天
+          </view>
+          <view
+            class="segment-control__item"
+            :class="{ 'is-active': trendDays === 15 }"
+            @click="switchRange(15)"
+          >
+            近15天
           </view>
         </view>
-        <view class="w-full h-600rpx px-20rpx box-border">
-          <qiun-data-charts type="area" :chartData="chartData" :opts="chartOpts" />
-        </view>
+      </view>
+      <view class="w-full h-600rpx px-20rpx box-border">
+        <qiun-data-charts
+          type="area"
+          :chartData="chartData"
+          :opts="chartOpts"
+          background="transparent"
+          :canvas2d="true"
+        />
       </view>
     </view>
   </view>
@@ -95,10 +96,9 @@
 import { computed, ref } from "vue";
 import dayjs from "dayjs";
 import { onReady, onShow } from "@dcloudio/uni-app";
-import { useUserStore } from "@/store";
+import { useThemeStore, useUserStore } from "@/store";
 import { useNavigation } from "@/composables/useNavigation";
-import { menuConfig } from "@/config/menu";
-import { isLoggedIn } from "@/utils/auth";
+import { workMenuGroups } from "@/config/work-menu";
 import { hasPermission } from "@/utils/permission";
 import LogAPI, { type VisitOverview, type VisitTrend } from "@/api/log";
 import NoticeAPI, { type NoticeItem } from "@/api/notice";
@@ -117,10 +117,11 @@ interface NavItem {
 }
 
 const userStore = useUserStore();
+const themeStore = useThemeStore();
 const { handleNavClick } = useNavigation();
 
-const current = ref(0);
-const recentDaysRange = ref(7);
+const activeSlideIndex = ref(0);
+const trendDays = ref(7);
 
 const swiperList = ref(["https://www.youlai.tech/storage/youlai/bg02.png"]);
 
@@ -141,13 +142,13 @@ const noticeText = computed(() => {
 });
 
 const userPerms = computed(() => userStore.userInfo?.perms || []);
-const isLogged = computed(() => isLoggedIn());
+const isAuthenticated = computed(() => userStore.isAuthenticated);
 const hasAnyPerm = computed(() => userPerms.value.length > 0);
 
 /** 默认菜单（未登录时显示） */
 const defaultNavList = computed(() => {
   const result: NavItem[] = [];
-  for (const group of menuConfig) {
+  for (const group of workMenuGroups) {
     for (const item of group.children) {
       result.push(item);
       if (result.length >= 4) return result;
@@ -158,9 +159,9 @@ const defaultNavList = computed(() => {
 
 /** 快捷入口：已登录按权限过滤，未登录显示默认菜单 */
 const quickNavList = computed(() => {
-  if (!isLogged.value || !hasAnyPerm.value) return defaultNavList.value;
+  if (!isAuthenticated.value || !hasAnyPerm.value) return defaultNavList.value;
   const result: NavItem[] = [];
-  for (const group of menuConfig) {
+  for (const group of workMenuGroups) {
     for (const item of group.children) {
       if (hasPermission(item.perm)) result.push(item);
       if (result.length >= 4) return result;
@@ -170,8 +171,11 @@ const quickNavList = computed(() => {
 });
 
 const chartData = ref({});
-const chartOpts = ref({
+const chartOpts = computed(() => ({
+  // canvas 不认 CSS 变量，系列色与轴标签色按选中色/主题取值
+  color: [themeStore.selectedThemeColor.primary],
   padding: [20, 0, 20, 0],
+  fontColor: themeStore.isDark ? "#a9aeb8" : "#666666",
   xAxis: { fontSize: 10, rotateLabel: true, rotateAngle: 30 },
   yAxis: { disabled: true },
   extra: {
@@ -184,11 +188,11 @@ const chartOpts = ref({
       activeType: "hollow",
     },
   },
-});
+}));
 
 /** 加载通知公告 */
 async function loadNoticeData() {
-  if (!isLogged.value) {
+  if (!isAuthenticated.value) {
     noticeList.value = [];
     return;
   }
@@ -211,7 +215,7 @@ function loadVisitOverviewData() {
 async function loadVisitTrendData() {
   const endDate = dayjs().format("YYYY-MM-DD");
   const startDate = dayjs()
-    .subtract(recentDaysRange.value - 1, "day")
+    .subtract(trendDays.value - 1, "day")
     .format("YYYY-MM-DD");
   try {
     const data: VisitTrend = await LogAPI.getVisitTrend({ startDate, endDate });
@@ -231,7 +235,7 @@ async function loadVisitTrendData() {
 
 /** 快捷导航点击（未登录跳转登录） */
 function handleNavClickWithGuard(item: NavItem) {
-  if (!isLogged.value || !hasAnyPerm.value) {
+  if (!isAuthenticated.value || !hasAnyPerm.value) {
     uni.navigateTo({ url: "/pages/login/index" });
     return;
   }
@@ -245,8 +249,8 @@ function handleNoticeClick() {
 
 /** 切换趋势时间范围 */
 function switchRange(value: number) {
-  if (recentDaysRange.value === value) return;
-  recentDaysRange.value = value;
+  if (trendDays.value === value) return;
+  trendDays.value = value;
   loadVisitTrendData();
 }
 
@@ -282,39 +286,39 @@ onShow(() => {
   background: linear-gradient(
     to bottom,
     transparent 0%,
-    var(--color-bg-secondary) 60%,
-    var(--color-bg-secondary) 100%
+    var(--color-bg-page) 60%,
+    var(--color-bg-page) 100%
   );
 }
 
 .chart-wrapper {
   box-sizing: border-box;
   overflow: hidden;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border: 1rpx solid var(--color-border);
   border-radius: 16rpx;
   box-shadow: var(--shadow-sm);
-}
 
-.chart-wrapper .chart-header {
-  display: flex;
-  gap: 24rpx;
-  align-items: center;
-  justify-content: space-between;
-  padding: 24rpx 20rpx;
-}
+  &__header {
+    display: flex;
+    gap: 24rpx;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24rpx 20rpx;
+  }
 
-.chart-header__title {
-  font-size: 28rpx;
-  font-weight: 600;
-  color: var(--color-text);
+  &__title {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: var(--color-text);
+  }
 }
 
 .segment-control {
   display: inline-flex;
   align-items: center;
   padding: 4rpx;
-  background: var(--color-bg-tertiary);
+  background: var(--color-fill-1);
   border: 1rpx solid var(--color-border);
   border-radius: 12rpx;
 }
@@ -333,22 +337,25 @@ onShow(() => {
   background: var(--color-primary);
 }
 
-.section--overlay {
+.quick-nav-card {
   position: relative;
   z-index: var(--z-sticky);
   padding: 18rpx 8rpx;
   margin: 24rpx;
   margin-top: -120rpx;
-  background: var(--color-bg);
+  overflow: hidden;
+  background: var(--color-bg-card);
   border-radius: 24rpx;
   box-shadow: var(--shadow-md);
-}
+  /* 网格项背景交给卡片本身，避免 wot 深色模式默认黑底 */
+  --wot-grid-item-bg: transparent;
 
-.nav-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 16rpx;
+  &__item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 16rpx;
+  }
 
   &__icon {
     width: 72rpx;
@@ -367,7 +374,7 @@ onShow(() => {
   display: flex;
   align-items: center;
   padding: 24rpx 24rpx 24rpx 20rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border: 1rpx solid var(--color-border);
   border-radius: 16rpx;
   box-shadow: var(--shadow-sm);
@@ -407,10 +414,18 @@ onShow(() => {
   flex-direction: column;
   padding: 24rpx 20rpx;
   overflow: hidden;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border: 1rpx solid var(--color-border);
   border-radius: 16rpx;
   box-shadow: var(--shadow-sm);
+  /* 数字与圆点统一取 --accent，访客数用 --uv 换成绿色 */
+  --accent: var(--color-primary);
+  --accent-glow: rgba(77, 128, 240, 0.3);
+
+  &--uv {
+    --accent: var(--color-success);
+    --accent-glow: rgba(52, 209, 157, 0.35);
+  }
 
   &__header {
     position: relative;
@@ -438,19 +453,9 @@ onShow(() => {
   &__dot {
     width: 12rpx;
     height: 12rpx;
+    background: var(--accent);
     border-radius: 50%;
-
-    &--uv,
-    &--green {
-      background: var(--color-success);
-      box-shadow: 0 0 10rpx rgba(52, 209, 157, 0.35);
-    }
-
-    &--pv,
-    &--blue {
-      background: var(--color-primary);
-      box-shadow: 0 0 10rpx rgba(77, 128, 240, 0.3);
-    }
+    box-shadow: 0 0 10rpx var(--accent-glow);
   }
 
   &__num {
@@ -458,30 +463,8 @@ onShow(() => {
     font-size: 48rpx;
     font-weight: 700;
     line-height: 1;
+    color: var(--accent);
     letter-spacing: -1rpx;
-
-    &--uv,
-    &--green {
-      color: var(--color-success);
-    }
-
-    &--pv,
-    &--blue {
-      color: var(--color-primary);
-    }
-  }
-
-  &--full {
-    flex-direction: row;
-    grid-column: 1 / -1;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx 20rpx;
-
-    .stat-card__num {
-      font-size: 28rpx;
-      letter-spacing: 0;
-    }
   }
 }
 </style>
diff --git a/src/pages/login/components/bind-mobile-popup.vue b/src/pages/login/components/bind-mobile-popup.vue
index 66ac9c2..132c450 100644
--- a/src/pages/login/components/bind-mobile-popup.vue
+++ b/src/pages/login/components/bind-mobile-popup.vue
@@ -6,7 +6,7 @@
     custom-class="popup-bottom"
     @close="handleClose"
   >
-    <view class="bind-mobile">
+    <view class="p-48rpx">
       <text class="bind-mobile__title">绑定手机号</text>
 
       <view class="bind-mobile__form">
@@ -61,9 +61,9 @@ export default {
 <script setup lang="ts">
 import { ref } from "vue";
 import { useToast } from "@wot-ui/ui";
-import { useSmsCode, isValidMobile } from "@/composables/useSmsCode";
+import { useSmsLoginCode, isValidMobile } from "@/composables/useSmsLoginCode";
 import { useUserStore } from "@/store/modules/user";
-import { getErrorMessage } from "@/utils";
+import { getErrorMessage } from "@/utils/error";
 
 /** 微信静默登录后需绑定手机号时，由父组件打开本弹窗 */
 const visible = defineModel<boolean>({ required: true });
@@ -75,7 +75,7 @@ const emit = defineEmits<{
 
 const toast = useToast();
 const userStore = useUserStore();
-const { countdown, send, reset } = useSmsCode();
+const { countdown, sendCode, resetCountdown } = useSmsLoginCode();
 
 const mobile = ref("18888888888");
 const code = ref("");
@@ -92,12 +92,12 @@ function open(boundOpenid: string) {
 }
 
 function handleClose() {
-  reset();
+  resetCountdown();
   code.value = "";
 }
 
 async function handleSendCode() {
-  await send(mobile.value);
+  await sendCode(mobile.value);
 }
 
 async function handleConfirm() {
@@ -113,7 +113,7 @@ async function handleConfirm() {
   isSubmitting.value = true;
   try {
     await userStore.bindMobileForWxMa({ openid, mobile: mobile.value, smsCode: code.value });
-    await userStore.getInfo();
+    await userStore.loadUserInfo();
     visible.value = false;
     toast.success("绑定成功");
     emit("success");
@@ -128,10 +128,6 @@ defineExpose({ open });
 </script>
 
 <style lang="scss" scoped>
-.bind-mobile {
-  padding: 48rpx;
-}
-
 .bind-mobile__title {
   display: block;
   margin-bottom: 48rpx;
@@ -147,7 +143,7 @@ defineExpose({ open });
   height: 88rpx;
   padding: 0 32rpx;
   margin-top: 24rpx;
-  background-color: var(--color-bg-secondary);
+  background-color: var(--color-fill-1);
   border-radius: 24rpx;
 }
 
@@ -176,7 +172,7 @@ defineExpose({ open });
 
   &--disabled {
     color: var(--color-text-placeholder);
-    background-color: var(--color-bg-tertiary);
+    background-color: var(--color-fill-1);
   }
 }
 
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 8a2ded1..6e4fd35 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -58,9 +58,16 @@
                 class="login__field-input"
                 placeholder="请输入密码"
                 :maxlength="50"
-                password
+                :password="!isPwdVisible"
                 @confirm="handleLogin"
               />
+              <wd-icon
+                :name="isPwdVisible ? 'eye' : 'eye-invisible'"
+                size="20"
+                color="var(--color-text-placeholder)"
+                class="login__field-suffix"
+                @click="isPwdVisible = !isPwdVisible"
+              />
             </view>
           </wd-form-item>
 
@@ -80,7 +87,7 @@
                 class="login__captcha-img"
                 :src="captchaBase64"
                 mode="aspectFit"
-                @click="fetchCaptcha"
+                @click="loadCaptcha"
               />
             </view>
           </wd-form-item>
@@ -114,7 +121,7 @@
 
           <!-- 登录按钮 -->
           <view class="login__form-item">
-            <wd-button block :loading="isLoading" @click="handleLogin">登 录</wd-button>
+            <wd-button block :loading="isLoggingIn" @click="handleLogin">登 录</wd-button>
           </view>
 
           <!-- 切换登录方式 -->
@@ -170,7 +177,7 @@
 
         <!-- 协议勾选 -->
         <view class="login__policy">
-          <wd-checkbox v-model="isAgreePolicy" type="square" size="32rpx">
+          <wd-checkbox v-model="hasAcceptedPolicy" type="square" size="32rpx">
             <text class="login__policy-text">
               我已阅读并同意
               <text class="login__policy-link" @click.stop="navigateToAgreement('user')">
@@ -191,7 +198,7 @@
     <bind-mobile-popup
       ref="bindMobilePopupRef"
       v-model="showBindMobilePopup"
-      @success="afterLoginSuccess"
+      @success="completeLogin"
     />
 
     <!-- 协议确认弹窗（useDialog("policy-box") 定向挂载，不能走全局实例） -->
@@ -205,8 +212,8 @@ import { useToast, useDialog } from "@wot-ui/ui";
 import type { FormSchema } from "@wot-ui/ui/components/wd-form/types";
 
 import { useUserStore } from "@/store/modules/user";
-import { useSmsCode, isValidMobile } from "@/composables/useSmsCode";
-import { getErrorMessage } from "@/utils";
+import { useSmsLoginCode, isValidMobile } from "@/composables/useSmsLoginCode";
+import { getErrorMessage } from "@/utils/error";
 import AuthAPI from "@/api/auth";
 import BindMobilePopup from "./components/bind-mobile-popup.vue";
 
@@ -223,10 +230,11 @@ const loginFormRef = ref();
 const bindMobilePopupRef = ref<InstanceType<typeof BindMobilePopup>>();
 
 // 表单状态
-const isLoading = ref(false);
-const isAgreePolicy = ref(false);
+const isLoggingIn = ref(false);
+const isPwdVisible = ref(false);
+const hasAcceptedPolicy = ref(false);
 const loginMode = ref<"PASSWORD" | "SMS" | "WECHAT">("PASSWORD");
-const { countdown: smsCountdown, send: sendCode, reset: resetSmsCountdown } = useSmsCode();
+const { countdown: smsCountdown, sendCode } = useSmsLoginCode();
 
 const formData = ref({
   username: "admin",
@@ -287,7 +295,7 @@ const formSchema = computed<FormSchema>(() => ({
 }));
 
 // 图形验证码
-const fetchCaptcha = async () => {
+const loadCaptcha = async () => {
   if (isCaptchaLoading.value) return;
   try {
     isCaptchaLoading.value = true;
@@ -302,9 +310,8 @@ const fetchCaptcha = async () => {
   }
 };
 
-// 切换登录方式
+// 切换登录方式（不重置验证码冷却：同一手机号冷却期内切回仍应等待）
 const toggleLoginMode = () => {
-  resetSmsCountdown();
   if (loginMode.value === "PASSWORD") {
     loginMode.value = "SMS";
     formData.value.username = "18888888888";
@@ -316,7 +323,7 @@ const toggleLoginMode = () => {
     formData.value.password = "123456";
     formData.value.code = "";
     formData.value.captchaCode = "";
-    fetchCaptcha();
+    loadCaptcha();
   }
 };
 
@@ -330,7 +337,7 @@ const openPolicyDialog = (action: "FORM" | "WECHAT_PHONE", phoneCode = "") => {
       msg: "请阅读并同意《用户协议》与《隐私政策》",
     })
     .then(async () => {
-      isAgreePolicy.value = true;
+      hasAcceptedPolicy.value = true;
       const act = pendingLoginAction.value;
       const code = pendingWechatPhoneCode.value;
       pendingLoginAction.value = null;
@@ -346,11 +353,11 @@ const openPolicyDialog = (action: "FORM" | "WECHAT_PHONE", phoneCode = "") => {
 
 // 表单登录
 async function doFormLogin() {
-  if (isLoading.value) return;
-  isLoading.value = true;
+  if (isLoggingIn.value) return;
+  isLoggingIn.value = true;
   try {
     if (loginMode.value === "PASSWORD") {
-      await userStore.login({
+      await userStore.loginByPassword({
         username: formData.value.username,
         password: formData.value.password,
         captchaId: captchaId.value,
@@ -363,12 +370,12 @@ async function doFormLogin() {
       });
     }
     toast.success("登录成功");
-    await afterLoginSuccess();
+    await completeLogin();
   } catch (error) {
     toast.error(getErrorMessage(error, "登录失败"));
-    if (loginMode.value === "PASSWORD") fetchCaptcha();
+    if (loginMode.value === "PASSWORD") loadCaptcha();
   } finally {
-    isLoading.value = false;
+    isLoggingIn.value = false;
   }
 }
 
@@ -379,7 +386,7 @@ const handleLogin = async () => {
     return;
   }
   // 再校验隐私协议
-  if (!isAgreePolicy.value) {
+  if (!hasAcceptedPolicy.value) {
     openPolicyDialog("FORM");
     return;
   }
@@ -398,7 +405,7 @@ interface WxPhoneLoginEvent {
 
 const handleWechatPhoneLogin = async (e: WxPhoneLoginEvent) => {
   const phoneCode = e.detail.code;
-  if (!isAgreePolicy.value) {
+  if (!hasAcceptedPolicy.value) {
     openPolicyDialog("WECHAT_PHONE", phoneCode);
     return;
   }
@@ -414,22 +421,22 @@ async function doWechatPhoneLogin(phoneCode: string) {
     await handleWechatSilentLogin();
     return;
   }
-  isLoading.value = true;
+  isLoggingIn.value = true;
   try {
     const { code: loginCode } = await uni.login();
     await userStore.loginByWxMaPhone({ loginCode, phoneCode });
     toast.success("登录成功");
-    await afterLoginSuccess();
+    await completeLogin();
   } catch {
     toast.info("正在尝试其他登录方式...");
     await handleWechatSilentLogin();
   } finally {
-    isLoading.value = false;
+    isLoggingIn.value = false;
   }
 }
 
 const handleWechatSilentLogin = async () => {
-  isLoading.value = true;
+  isLoggingIn.value = true;
   try {
     const { code } = await uni.login();
     const result = await userStore.loginByWxMa(code);
@@ -437,18 +444,18 @@ const handleWechatSilentLogin = async () => {
       bindMobilePopupRef.value?.open(result.openid);
       showBindMobilePopup.value = true;
     } else if (result.accessToken) {
-      await afterLoginSuccess();
+      await completeLogin();
     }
   } catch (error) {
     toast.error(getErrorMessage(error, "微信登录失败"));
   } finally {
-    isLoading.value = false;
+    isLoggingIn.value = false;
   }
 };
 
 /** 绑定手机号成功后的会话初始化与跳转 */
-async function afterLoginSuccess() {
-  await userStore.getInfo();
+async function completeLogin() {
+  await userStore.loadUserInfo();
   setTimeout(() => uni.reLaunch({ url: redirect.value }), 800);
 }
 
@@ -464,7 +471,7 @@ const navigateToAgreement = (type: string) => {
 onLoad((options) => {
   const fromQuery = options?.redirect ? decodeURIComponent(options.redirect) : "";
   if (fromQuery && fromQuery !== "/pages/login/index") redirect.value = fromQuery;
-  fetchCaptcha();
+  loadCaptcha();
 });
 </script>
 
@@ -473,8 +480,8 @@ onLoad((options) => {
   min-height: 100vh;
   background: linear-gradient(
     135deg,
-    var(--color-bg-tertiary) 0%,
-    var(--color-bg) 50%,
+    var(--color-bg-page) 0%,
+    var(--color-bg-card) 50%,
     var(--color-primary-light) 100%
   );
 }
@@ -533,7 +540,7 @@ onLoad((options) => {
   width: 120rpx;
   height: 120rpx;
   margin-bottom: 20rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border: 1rpx solid var(--color-border);
   border-radius: 28rpx;
   box-shadow: var(--shadow-sm);
@@ -554,13 +561,13 @@ onLoad((options) => {
 .login__card {
   width: 100%;
   padding: 44rpx;
-  background-color: var(--color-bg);
+  background-color: var(--color-bg-card);
   border: 2rpx solid var(--color-border-light);
   border-radius: 48rpx;
-  box-shadow: 0 20rpx 50rpx -10rpx rgba(0, 0, 0, 0.1);
+  box-shadow: var(--shadow-float);
 
   @supports (backdrop-filter: blur(24px)) or (-webkit-backdrop-filter: blur(24px)) {
-    background-color: var(--color-bg-alpha-95);
+    background-color: var(--color-bg-card-alpha-95);
     -webkit-backdrop-filter: blur(24px);
     backdrop-filter: blur(24px);
   }
@@ -586,19 +593,23 @@ onLoad((options) => {
 }
 
 .login__form-item {
-  margin-top: 28rpx;
+  margin-top: 40rpx;
 
   &:first-child {
     margin-top: 0;
   }
 }
 
-// 覆盖 wd-form-item 默认样式，仅用于校验和错误提示
-:deep(.wd-form-item) {
-  padding: 0 !important;
-  margin-top: 28rpx;
+// 表单行：去掉 cell 默认内边距，与按钮/分割线同宽，行距统一
+.login__card :deep(.wd-form-item.wd-cell) {
+  padding: 0;
+  margin-top: 24rpx;
   background: transparent;
 
+  .wd-cell__right {
+    margin-top: 0;
+  }
+
   &:first-child {
     margin-top: 0;
   }
@@ -613,40 +624,51 @@ onLoad((options) => {
   flex-direction: column;
 }
 
-:deep(.wd-form-item .wd-cell__right) {
+:deep(.wd-form-item .wd-cell__right),
+:deep(.wd-form-item .wd-cell__body),
+:deep(.wd-form-item .wd-cell__value) {
   width: 100%;
 }
 
-// 错误提示：独占一行，显示在输入框下方
-:deep(.wd-form-item__error-message) {
-  display: block !important;
-  width: 100% !important;
-  padding: 8rpx 0 0 !important;
-  font-size: 24rpx !important;
-  line-height: 1.5 !important;
-  color: var(--color-danger) !important;
+// 错误提示：独占一行，显示在输入框下方（颜色沿用 wot 默认的 danger）
+.login__card :deep(.wd-form-item__error-message) {
+  display: block;
+  width: 100%;
+  padding: 8rpx 0 0;
+  font-size: 24rpx;
+  line-height: 1.5;
 }
 
 // 输入框行
 .login__field {
+  box-sizing: border-box;
   display: flex;
   align-items: center;
+  width: 100%;
   height: 88rpx;
   padding: 0 32rpx;
-  background-color: var(--color-bg-secondary);
+  background-color: var(--color-fill-1);
   border-radius: 24rpx;
 }
 
 .login__field-input {
   flex: 1;
+  min-width: 0;
   height: 100%;
   margin-left: 24rpx;
   font-size: 28rpx;
   color: var(--color-text);
 }
 
+// 密码显隐图标
+.login__field-suffix {
+  flex-shrink: 0;
+  padding-left: 20rpx;
+}
+
 // 图形验证码图片
 .login__captcha-img {
+  flex-shrink: 0;
   width: 200rpx;
   height: 72rpx;
   border-radius: 12rpx;
@@ -692,14 +714,13 @@ onLoad((options) => {
 
   &--disabled {
     color: var(--color-text-placeholder);
-    background-color: var(--color-bg-tertiary);
+    background-color: var(--color-fill-1);
   }
 }
 
 .login__mode-switch {
   display: flex;
   justify-content: center;
-  padding-top: 24rpx;
 }
 
 .login__mode-switch-text {
@@ -712,7 +733,6 @@ onLoad((options) => {
   font-size: 28rpx;
   font-weight: 500;
   color: var(--color-primary);
-  border-bottom: 2rpx solid var(--color-primary);
 }
 
 .login__divider {
diff --git a/src/pages/mine/components/community-card.vue b/src/pages/mine/components/community-card.vue
index 64aae8f..7036780 100644
--- a/src/pages/mine/components/community-card.vue
+++ b/src/pages/mine/components/community-card.vue
@@ -56,22 +56,23 @@ const emit = defineEmits<{
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: var(--z-sticky);
+  z-index: var(--z-mask);
   background: linear-gradient(
     90deg,
-    var(--color-glass) 0%,
-    var(--color-glass-light) 55%,
-    var(--color-glass) 100%
+    var(--color-media-mask) 0%,
+    var(--color-media-mask-light) 55%,
+    var(--color-media-mask) 100%
   );
 }
 
 .community-card__logo {
   position: relative;
+  z-index: var(--z-content);
   box-sizing: border-box;
   width: 84rpx;
   height: 84rpx;
   padding: 10rpx;
-  background: var(--color-bg-alpha-95);
+  background: var(--color-bg-card-alpha-95);
   border: 1rpx solid var(--color-border-glass);
   border-radius: 20rpx;
   box-shadow: var(--shadow-sm);
@@ -79,12 +80,14 @@ const emit = defineEmits<{
 
 .community-card__body {
   position: relative;
+  z-index: var(--z-content);
   flex: 1;
   min-width: 0;
 }
 
 .community-card__arrow {
   position: relative;
+  z-index: var(--z-content);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -98,19 +101,24 @@ const emit = defineEmits<{
   display: flex;
   gap: 16rpx;
   align-items: center;
+  margin-top: 14rpx;
 }
 
 .community-card__title {
-  display: block;
-  margin-top: 14rpx;
+  flex-shrink: 0;
   font-size: 32rpx;
   font-weight: 600;
+  line-height: 1;
   color: var(--color-text);
   letter-spacing: 0.4rpx;
 }
 
+/* wd-tag 外层是自定义组件节点，压掉其行高避免与标题错位 */
 .community-card__tag {
-  margin-top: 14rpx;
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
+  line-height: 1;
 }
 
 .community-card__desc {
diff --git a/src/pages/mine/components/menu-section.vue b/src/pages/mine/components/menu-section.vue
index 01d552a..e8061be 100644
--- a/src/pages/mine/components/menu-section.vue
+++ b/src/pages/mine/components/menu-section.vue
@@ -1,6 +1,6 @@
 <template>
-  <view class="section-card">
-    <text class="section-title">{{ title }}</text>
+  <view class="menu-section">
+    <text class="menu-section__title">{{ title }}</text>
     <view class="menu-list">
       <view
         v-for="item in items"
@@ -51,19 +51,19 @@ const emit = defineEmits<{
 </script>
 
 <style lang="scss" scoped>
-.section-card {
+.menu-section {
   padding: 28rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border-radius: 32rpx;
   box-shadow: var(--shadow-md);
-}
 
-.section-title {
-  display: block;
-  margin-bottom: 18rpx;
-  font-size: 26rpx;
-  font-weight: 600;
-  color: var(--color-text);
+  &__title {
+    display: block;
+    margin-bottom: 18rpx;
+    font-size: 26rpx;
+    font-weight: 600;
+    color: var(--color-text);
+  }
 }
 
 .menu-list {
@@ -91,10 +91,7 @@ const emit = defineEmits<{
   height: 72rpx;
   border-radius: 22rpx;
 
-  &--primary {
-    background: var(--color-primary-alpha-15);
-  }
-
+  &--primary,
   &--warning {
     background: var(--color-primary-alpha-15);
   }
diff --git a/src/pages/mine/components/profile-card.vue b/src/pages/mine/components/profile-card.vue
index ffc7e93..1de61f8 100644
--- a/src/pages/mine/components/profile-card.vue
+++ b/src/pages/mine/components/profile-card.vue
@@ -3,7 +3,7 @@
     <view class="profile-card__header">
       <view class="profile-card__left" @click="emit('profile')">
         <image class="profile-card__avatar" :src="avatar" mode="aspectFill" lazy-load />
-        <view v-if="isLogin" class="profile-card__online-dot" />
+        <view v-if="isAuthenticated" class="profile-card__online-dot" />
       </view>
 
       <view class="profile-card__main" @click="emit('profile')">
@@ -11,12 +11,12 @@
           <text class="profile-card__name">{{ name }}</text>
         </view>
 
-        <view v-if="isLogin" class="profile-card__tags">
-          <view class="profile-tag">
+        <view v-if="isAuthenticated" class="profile-card__tags">
+          <view class="profile-card__tag">
             <wd-icon name="user" size="12" color="var(--color-text-inverse)" />
             <text>{{ username }}</text>
           </view>
-          <view class="profile-tag">
+          <view class="profile-card__tag">
             <wd-icon
               :name="deptName ? 'home' : 'safe'"
               size="12"
@@ -29,14 +29,13 @@
         <text v-else class="profile-card__hint">登录使用更多功能</text>
       </view>
 
-      <view v-if="isLogin" class="profile-card__actions">
-        <view
-          class="profile-card__action-btn"
-          aria-label="通知"
-          @click.stop="emit('notifications')"
-        >
-          <wd-icon name="notification" size="16" color="var(--color-text-inverse)" />
-        </view>
+      <view
+        v-if="isAuthenticated"
+        class="profile-card__scan"
+        aria-label="扫一扫"
+        @click.stop="emit('scan')"
+      >
+        <wd-icon name="scan" size="18" color="var(--color-text-inverse)" />
       </view>
 
       <view v-else class="profile-card__action" @click.stop="emit('login')">
@@ -48,7 +47,7 @@
 
 <script lang="ts" setup>
 defineProps<{
-  isLogin: boolean;
+  isAuthenticated: boolean;
   avatar: string;
   name: string;
   username: string;
@@ -58,7 +57,7 @@ defineProps<{
 const emit = defineEmits<{
   profile: [];
   login: [];
-  notifications: [];
+  scan: [];
 }>();
 </script>
 
@@ -68,7 +67,7 @@ const emit = defineEmits<{
   display: flex;
   padding: 28rpx 28rpx;
   overflow: hidden;
-  background: var(--color-bg-alpha-95);
+  background: var(--color-bg-card-alpha-95);
   border: 1rpx solid var(--color-border-glass);
   border-radius: 28rpx;
   box-shadow: var(--shadow-md);
@@ -95,6 +94,7 @@ const emit = defineEmits<{
 }
 
 .profile-card__avatar {
+  box-sizing: border-box;
   flex-shrink: 0;
   width: 120rpx;
   height: 120rpx;
@@ -105,42 +105,15 @@ const emit = defineEmits<{
 
 .profile-card__online-dot {
   position: absolute;
-  right: -4rpx;
-  bottom: -4rpx;
+  right: 4rpx;
+  bottom: 4rpx;
   width: 16rpx;
   height: 16rpx;
   background: var(--color-success);
-  border: 2rpx solid var(--color-bg);
+  border: 2rpx solid var(--color-bg-card);
   border-radius: 50%;
 }
 
-.profile-card__actions {
-  display: flex;
-  flex-shrink: 0;
-  gap: 10rpx;
-  align-items: center;
-  margin-right: -10rpx;
-  margin-left: auto;
-}
-
-.profile-card__action-btn {
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 52rpx;
-  height: 52rpx;
-  background: var(--color-bg-alpha-95);
-  border: 1rpx solid var(--color-border-glass);
-  border-radius: 999rpx;
-
-  @supports (backdrop-filter: blur(10px)) or (-webkit-backdrop-filter: blur(10px)) {
-    background: var(--color-glass-light);
-    -webkit-backdrop-filter: blur(10px);
-    backdrop-filter: blur(10px);
-  }
-}
-
 .profile-card__main {
   flex: 1;
   min-width: 0;
@@ -174,9 +147,24 @@ const emit = defineEmits<{
   gap: 12rpx;
 }
 
+.profile-card__scan {
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
+  align-self: flex-start;
+  justify-content: center;
+  width: 64rpx;
+  height: 64rpx;
+  margin-left: auto;
+  background: var(--color-glass-light);
+  border: 1rpx solid var(--color-border-glass);
+  border-radius: 999rpx;
+}
+
 .profile-card__action {
   flex-shrink: 0;
   align-self: center;
+  margin-left: auto;
 }
 
 .profile-card__button {
@@ -190,7 +178,7 @@ const emit = defineEmits<{
   border-radius: 999rpx;
 }
 
-.profile-tag {
+.profile-card__tag {
   display: inline-flex;
   gap: 8rpx;
   align-items: center;
diff --git a/src/pages/mine/components/quick-cards.vue b/src/pages/mine/components/quick-cards.vue
index 44a1375..e4d9481 100644
--- a/src/pages/mine/components/quick-cards.vue
+++ b/src/pages/mine/components/quick-cards.vue
@@ -44,7 +44,7 @@ const emit = defineEmits<{
   gap: 20rpx;
   align-items: center;
   padding: 28rpx 24rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border-radius: 24rpx;
   box-shadow: var(--shadow-sm);
 }
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index ee8873b..3d71074 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -1,20 +1,13 @@
 <template>
   <view>
     <view class="mine-hero" :style="{ paddingTop: `${navbar.totalHeight.value}px` }">
-      <view class="mine-hero__bg" :style="{ background: headerBackground }" />
-
       <custom-navbar
-        bg-color="transparent"
+        :bg-color="isScrolled ? headerBackground : 'transparent'"
         title-color="var(--color-text-inverse)"
         icon-color="var(--color-text-inverse)"
         :show-back="false"
         :placeholder="false"
       >
-        <template #left>
-          <view v-if="isLogin" class="mine-navbar__scan" aria-label="扫一扫" @click="scanLogin">
-            <wd-icon name="scan" size="40rpx" color="var(--color-text-inverse)" />
-          </view>
-        </template>
         <template #center>
           <text class="mine-navbar__title">个人中心</text>
         </template>
@@ -22,25 +15,39 @@
 
       <view class="mine-hero__content">
         <profile-card
-          :is-login="isLogin"
+          :is-authenticated="isAuthenticated"
           :avatar="avatar"
           :name="displayName"
           :username="username"
           :dept-name="deptName"
           @profile="openProfile"
           @login="navigateToLogin"
-          @notifications="openNotifications"
+          @scan="scanLogin"
         />
 
-        <community-card @open="openOfficialAccount" />
+        <view class="community-slot">
+          <view class="community-slot__bg" :style="{ background: headerBackground }" />
+          <community-card @open="openOfficialAccount" />
+        </view>
 
-        <quick-cards v-if="isLogin" @profile="openProfile" @account="openAccount" />
+        <quick-cards v-if="isAuthenticated" @profile="openProfile" @account="openAccount" />
       </view>
     </view>
 
     <view class="mine-body">
       <menu-section title="系统工具" :items="toolMenus" @select="handleMenuSelect" />
       <menu-section title="帮助与支持" :items="helpMenus" @select="handleMenuSelect" />
+
+      <wd-button
+        v-if="isAuthenticated"
+        type="danger"
+        variant="plain"
+        size="large"
+        block
+        @click="confirmLogout"
+      >
+        退出登录
+      </wd-button>
     </view>
 
     <wd-loading
@@ -55,12 +62,14 @@
 
 <script lang="ts" setup>
 import { computed, ref } from "vue";
-import { onShow } from "@dcloudio/uni-app";
+import { onPageScroll, onShow } from "@dcloudio/uni-app";
+import { storeToRefs } from "pinia";
 import { useUserStore, useThemeStore } from "@/store";
 import { useRouter } from "uni-mini-router";
 import { useNavbar } from "@/composables/useNavbar";
 import { useScanLogin } from "@/composables/useScanLogin";
-import { formatBytes } from "@/utils/format";
+import { useLogout } from "@/composables/useLogout";
+import { useCacheCleaner } from "@/composables/useCacheCleaner";
 import ProfileCard from "./components/profile-card.vue";
 import CommunityCard from "./components/community-card.vue";
 import QuickCards from "./components/quick-cards.vue";
@@ -77,20 +86,26 @@ const themeStore = useThemeStore();
 const router = useRouter();
 const navbar = useNavbar({ hasTabbar: true });
 const { scanLogin } = useScanLogin();
-const toast = useToast();
+const { confirmLogout } = useLogout();
 
-const isLogin = computed(() => !!userStore.userInfo);
+/** 滚动后导航栏补上渐变背景，否则内容会从透明导航栏下穿过 */
+const isScrolled = ref(false);
+onPageScroll(({ scrollTop }) => {
+  isScrolled.value = scrollTop > 0;
+});
+
+const { isAuthenticated } = storeToRefs(userStore);
 const userInfo = computed(() => userStore.userInfo);
 const defaultAvatar = "/static/images/default-avatar.png";
 
 const avatar = computed(() =>
-  isLogin.value && userInfo.value?.avatar ? userInfo.value.avatar : defaultAvatar
+  isAuthenticated.value && userInfo.value?.avatar ? userInfo.value.avatar : defaultAvatar
 );
 const displayName = computed(() =>
-  isLogin.value ? userInfo.value?.nickname || "匿名用户" : "欢迎使用"
+  isAuthenticated.value ? userInfo.value?.nickname || "匿名用户" : "欢迎使用"
 );
 const username = computed(() => userInfo.value?.username || "未设置账号");
-const deptName = computed(() => (isLogin.value ? userInfo.value?.deptName || "" : ""));
+const deptName = computed(() => (isAuthenticated.value ? userInfo.value?.deptName || "" : ""));
 
 const headerBackground = computed(() => {
   const color = themeStore.themeVars.colorTheme || "var(--color-primary)";
@@ -100,32 +115,44 @@ const headerBackground = computed(() => {
 });
 
 const appVersion = ref("1.0.0");
-const isClearing = ref(false);
-const cacheSize = ref<string>("计算中...");
+const {
+  usageText: storageUsageText,
+  isClearing,
+  loadUsage: loadStorageUsage,
+  clear: clearCache,
+} = useCacheCleaner();
 
+// 常用功能在前，维护操作在后
 const toolMenus = computed<MenuItem[]>(() => [
-  { key: "network", icon: "tool", tone: "warning", title: "网络检测", desc: "检测接口连通性" },
+  {
+    key: "notice",
+    icon: "notification",
+    tone: "primary",
+    title: "消息通知",
+    desc: "查看系统通知与公告",
+  },
+  { key: "theme", icon: "settings", tone: "primary", title: "主题设置", desc: "主题色与明暗模式" },
+  {
+    key: "network",
+    icon: "wifi",
+    tone: "primary",
+    title: "网络检测",
+    desc: "检测网络与服务器连接",
+  },
   {
     key: "clear-cache",
     icon: "delete",
     tone: "danger",
     title: "清理缓存",
-    desc: "显示当前缓存大小",
-    value: cacheSize.value,
+    desc: "释放本地存储空间",
+    value: storageUsageText.value,
   },
 ]);
 
 const helpMenus = computed<MenuItem[]>(() => [
-  {
-    key: "settings",
-    icon: "settings",
-    tone: "primary",
-    title: "系统设置",
-    desc: "主题、语言、通知等设置",
-  },
   {
     key: "agreement",
-    icon: "safe",
+    icon: "file",
     tone: "success",
     title: "用户协议",
     desc: "了解产品使用规则",
@@ -141,15 +168,20 @@ const helpMenus = computed<MenuItem[]>(() => [
 ]);
 
 const menuRoutes: Record<string, string> = {
+  notice: "/subPages/work/notice/index",
   network: "/subPages/mine/settings/network/index",
-  settings: "/subPages/mine/settings/index",
+  theme: "/subPages/mine/settings/theme/index",
   agreement: "/subPages/mine/settings/agreement/index",
   about: "/subPages/mine/about/index",
 };
 
 function handleMenuSelect(key: string) {
   if (key === "clear-cache") {
-    handleClearCache();
+    clearCache();
+    return;
+  }
+  if (key === "notice" && !isAuthenticated.value) {
+    navigateToLogin();
     return;
   }
   const path = menuRoutes[key];
@@ -167,7 +199,7 @@ const navigateToLogin = () => {
 };
 
 const openProfile = () => {
-  if (!isLogin.value) {
+  if (!isAuthenticated.value) {
     navigateToLogin();
     return;
   }
@@ -176,21 +208,13 @@ const openProfile = () => {
 
 // 账号和安全
 const openAccount = () => {
-  if (!isLogin.value) {
+  if (!isAuthenticated.value) {
     navigateToLogin();
     return;
   }
   router.push({ path: "/subPages/mine/account/index" });
 };
 
-const openNotifications = () => {
-  if (!isLogin.value) {
-    navigateToLogin();
-    return;
-  }
-  toast.info("功能开发中");
-};
-
 // 有来技术公众号
 const openOfficialAccount = () => {
   uni.navigateTo({
@@ -203,10 +227,11 @@ const hasUserProfile = computed(() => {
   return !!(info && (info.userId || info.username || info.nickname));
 });
 
-const fetchUserInfoIfNeeded = async () => {
-  if (!isLogin.value || hasUserProfile.value) return;
+const loadUserInfoIfNeeded = async () => {
+  // 已登录但资料未加载时补拉（loadUserInfo），专治「token 在、userInfo 空」的断档态
+  if (!isAuthenticated.value || hasUserProfile.value) return;
   try {
-    await userStore.getInfo();
+    await userStore.loadUserInfo();
   } catch {
     // ignore
   }
@@ -219,54 +244,10 @@ const syncMiniProgramVersion = () => {
 };
 
 onShow(async () => {
-  await fetchUserInfoIfNeeded();
-  await fetchCacheSize();
+  await loadUserInfoIfNeeded();
+  await loadStorageUsage();
   syncMiniProgramVersion();
 });
-
-const fetchCacheSize = async () => {
-  try {
-    // #ifdef MP-WEIXIN
-    const res = await uni.getStorageInfo();
-    cacheSize.value = formatBytes(res.currentSize);
-    // #endif
-    // #ifdef H5
-    cacheSize.value = formatBytes(
-      Object.keys(localStorage).reduce((size, key) => size + localStorage[key].length, 0)
-    );
-    // #endif
-    if (!cacheSize.value) {
-      cacheSize.value = "0B";
-    }
-  } catch {
-    cacheSize.value = "获取失败";
-  }
-};
-
-const handleClearCache = async () => {
-  if (cacheSize.value === "获取失败") {
-    toast.info("获取缓存信息失败，请稍后重试");
-    return;
-  }
-  if (cacheSize.value === "0B") {
-    toast.info("暂无缓存需要清理");
-    return;
-  }
-  if (isClearing.value) {
-    return;
-  }
-
-  try {
-    isClearing.value = true;
-    await uni.clearStorage();
-    await fetchCacheSize();
-    toast.success("清理成功");
-  } catch {
-    toast.error("清理失败");
-  } finally {
-    isClearing.value = false;
-  }
-};
 </script>
 
 <style lang="scss" scoped>
@@ -276,12 +257,18 @@ const handleClearCache = async () => {
   overflow: visible;
 }
 
-.mine-hero__bg {
+/* 渐变以社区卡片为锚点：底边压在卡片中线、上沿穿到导航栏后面，形成卡片被背景分割的效果 */
+.community-slot {
+  position: relative;
+}
+
+.community-slot__bg {
   position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  height: 520rpx;
+  right: -28rpx;
+  bottom: 50%;
+  left: -28rpx;
+  z-index: -1;
+  height: 800rpx;
   pointer-events: none;
 }
 
@@ -301,20 +288,6 @@ const handleClearCache = async () => {
   letter-spacing: 2rpx;
 }
 
-/* 扫码入口：渐变背景上的白色图标，64rpx 圆形热区 */
-.mine-navbar__scan {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 64rpx;
-  height: 64rpx;
-  border-radius: 50%;
-
-  &:active {
-    background-color: rgba(255, 255, 255, 0.2);
-  }
-}
-
 .mine-body {
   position: relative;
   z-index: var(--z-base);
@@ -323,7 +296,7 @@ const handleClearCache = async () => {
   gap: 24rpx;
   padding: 0 28rpx 40rpx;
   margin-top: 0;
-  background: var(--color-bg-secondary);
+  background: var(--color-bg-page);
   border-top-left-radius: 48rpx;
   border-top-right-radius: 48rpx;
 }
@@ -333,7 +306,7 @@ const handleClearCache = async () => {
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: rgba(15, 23, 42, 0.72);
+  background: var(--color-overlay);
   border-radius: 24rpx;
 }
 </style>
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index d76bceb..3a27f9a 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -13,10 +13,10 @@
               use-slot
               @click="handleNavClick(child)"
             >
-              <view class="work-grid__icon p-2">
+              <view class="p-2">
                 <image class="w-72rpx h-72rpx rounded-8rpx" :src="child.icon" />
               </view>
-              <view class="work-grid__label">{{ child.title }}</view>
+              <view>{{ child.title }}</view>
             </wd-grid-item>
           </wd-grid>
         </wd-card>
@@ -28,7 +28,7 @@
 <script lang="ts" setup>
 import { computed } from "vue";
 import { useNavigation } from "@/composables/useNavigation";
-import { menuConfig } from "@/config/menu";
+import { workMenuGroups } from "@/config/work-menu";
 import { hasPermission as checkPermission } from "@/utils/permission";
 
 definePage({
@@ -50,7 +50,7 @@ const hasPermission = (perm: string) => {
 
 // 根据权限过滤后的菜单列表
 const visibleGridList = computed(() => {
-  return menuConfig
+  return workMenuGroups
     .map((group) => ({
       ...group,
       children: group.children.filter((item) => hasPermission(item.perm)),
diff --git a/src/router/index.ts b/src/router/index.ts
index e4e325f..b0c7ad9 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { pages, subPackages } from "virtual:uni-pages";
+import { pages, subPackages } from "virtual:uni-pages";
 import { getAccessToken } from "@/utils/auth";
 import { createRouter } from "uni-mini-router";
 import { useUserStore } from "@/store";
@@ -73,7 +73,7 @@ router.beforeEach(async (to, from, next) => {
     const userStore = useUserStore();
     if (!userStore.userInfo) {
       try {
-        await userStore.getInfo();
+        await userStore.loadUserInfo();
       } catch {
         next(false);
         userStore.logout();
diff --git a/src/static/icons/api.svg b/src/static/icons/api.svg
index c62b181..1188540 100644
--- a/src/static/icons/api.svg
+++ b/src/static/icons/api.svg
@@ -1,8 +1,10 @@
 <svg t="1773314000001" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200">
-  <path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#409EFF" p-id="10001"></path>
-  <path d="M324.408781 655.018925C505.290126 655.018925 651.918244 508.387706 651.918244 327.509463c0-152.138029-103.733293-280.047334-244.329811-316.853972C205.813923 52.463528 47.497011 213.017581 8.987325 415.981977 47.587706 553.880127 174.183098 655.018925 324.408781 655.018925z" fill="#FFFFFF" fill-opacity=".2" p-id="10002"></path>
-  <path d="M512 1024c282.766631 0 512-229.233369 512-512 0-31.765705-2.891385-62.853911-8.433853-93.018889C928.057169 336.0999 809.874701 285.26268 679.824375 285.26268c-269.711213 0-488.357305 218.645317-488.357305 488.357305 0 54.959576 9.084221 107.802937 25.822474 157.10377C300.626556 989.489417 402.283167 1024 512 1024z" fill="#FFFFFF" fill-opacity=".15" p-id="10003"></path>
-  <path d="M732.535958 756.566238c36.389596 0 65.889478-29.499882 65.889477-65.889478 0 36.389596 29.502983 65.889478 65.889478 65.889478-17.053747 0-65.889478 29.502983-65.889478 65.889477 0-36.386495-29.499882-65.889478-65.889477-65.889477zM159.685087 247.279334c25.686819 0 46.51022-20.8234 46.51022-46.51022 0 25.686819 20.8234 46.51022 46.510219 46.51022-12.03607 0-46.51022 20.8234-46.510219 46.510219 0-25.686819-20.8234-46.51022-46.51022-46.510219z" fill="#FFFFFF" fill-opacity=".5" p-id="10004"></path>
-  <path d="M206.195307 333.32324c8.562531 0 15.503407-6.940875 15.503406-15.503407 0 8.562531 6.940875 15.503407 15.503407 15.503407-4.012282 0-15.503407 6.940875-15.503407 15.503406 0-8.562531-6.940875-15.503407-15.503406-15.503406z" fill="#FFFFFF" fill-opacity=".3" p-id="10005"></path>
-  <text x="512" y="512" text-anchor="middle" dominant-baseline="central" font-size="380" font-weight="900" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="18" stroke-linejoin="round" font-family="monospace">&lt;/&gt;</text>
-</svg>
\ No newline at end of file
+  <path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#409EFF"></path>
+  <path d="M324.408781 655.018925C505.290126 655.018925 651.918244 508.387706 651.918244 327.509463c0-152.138029-103.733293-280.047334-244.329811-316.853972C205.813923 52.463528 47.497011 213.017581 8.987325 415.981977 47.587706 553.880127 174.183098 655.018925 324.408781 655.018925z" fill="#FFFFFF" fill-opacity=".2"></path>
+  <path d="M512 1024c282.766631 0 512-229.233369 512-512 0-31.765705-2.891385-62.853911-8.433853-93.018889C928.057169 336.0999 809.874701 285.26268 679.824375 285.26268c-269.711213 0-488.357305 218.645317-488.357305 488.357305 0 54.959576 9.084221 107.802937 25.822474 157.10377C300.626556 989.489417 402.283167 1024 512 1024z" fill="#FFFFFF" fill-opacity=".15"></path>
+  <path d="M732.535958 756.566238c36.389596 0 65.889478-29.499882 65.889477-65.889478 0 36.389596 29.502983 65.889478 65.889478 65.889478-17.053747 0-65.889478 29.502983-65.889478 65.889477 0-36.386495-29.499882-65.889478-65.889477-65.889477zM159.685087 247.279334c25.686819 0 46.51022-20.8234 46.51022-46.51022 0 25.686819 20.8234 46.51022 46.510219 46.51022-12.03607 0-46.51022 20.8234-46.510219 46.510219 0-25.686819-20.8234-46.51022-46.51022-46.510219z" fill="#FFFFFF" fill-opacity=".5"></path>
+  <path d="M206.195307 333.32324c8.562531 0 15.503407-6.940875 15.503406-15.503407 0 8.562531 6.940875 15.503407 15.503407 15.503407-4.012282 0-15.503407 6.940875-15.503407 15.503406 0-8.562531-6.940875-15.503407-15.503406-15.503406z" fill="#FFFFFF" fill-opacity=".3"></path>
+  <g fill="#FFFFFF" transform="translate(512 512) scale(2.45) translate(-128 -128)">
+    <path d="M149.66 149.66L131.31 168l18.35 18.34a8 8 0 0 1-11.32 11.32l-6.34-6.35l-23.31 23.32a32.06 32.06 0 0 1-45.26 0l-5.37-5.38l-28.4 28.41a8 8 0 0 1-11.32-11.32l28.41-28.4l-5.38-5.37a32 32 0 0 1 0-45.26L64.69 124l-6.35-6.34a8 8 0 0 1 11.32-11.32L88 124.69l18.34-18.35a8 8 0 0 1 11.32 11.32L99.31 136L120 156.69l18.34-18.35a8 8 0 0 1 11.32 11.32m88-131.32a8 8 0 0 0-11.32 0l-28.4 28.41l-5.37-5.38a32.05 32.05 0 0 0-45.26 0L124 64.69l-6.34-6.35a8 8 0 0 0-11.32 11.32l80 80a8 8 0 0 0 11.32-11.32l-6.35-6.34l23.32-23.31a32 32 0 0 0 0-45.26l-5.38-5.37l28.41-28.4a8 8 0 0 0 0-11.32"/>
+  </g>
+</svg>
diff --git a/src/static/icons/git.svg b/src/static/icons/git.svg
deleted file mode 100644
index f8b39af..0000000
--- a/src/static/icons/git.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1773314000002" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#F05032" p-id="20001"></path><path d="M324.408781 655.018925C505.290126 655.018925 651.918244 508.387706 651.918244 327.509463c0-152.138029-103.733293-280.047334-244.329811-316.853972C205.813923 52.463528 47.497011 213.017581 8.987325 415.981977 47.587706 553.880127 174.183098 655.018925 324.408781 655.018925z" fill="#FFFFFF" fill-opacity=".2" p-id="20002"></path><path d="M512 1024c282.766631 0 512-229.233369 512-512 0-31.765705-2.891385-62.853911-8.433853-93.018889C928.057169 336.0999 809.874701 285.26268 679.824375 285.26268c-269.711213 0-488.357305 218.645317-488.357305 488.357305 0 54.959576 9.084221 107.802937 25.822474 157.10377C300.626556 989.489417 402.283167 1024 512 1024z" fill="#FFFFFF" fill-opacity=".15" p-id="20003"></path><path d="M732.535958 756.566238c36.389596 0 65.889478-29.499882 65.889477-65.889478 0 36.389596 29.502983 65.889478 65.889478 65.889478-17.053747 0-65.889478 29.502983-65.889478 65.889477 0-36.386495-29.499882-65.889478-65.889477-65.889477zM159.685087 247.279334c25.686819 0 46.51022-20.8234 46.51022-46.51022 0 25.686819 20.8234 46.51022 46.510219 46.51022-12.03607 0-46.51022 20.8234-46.510219 46.510219 0-25.686819-20.8234-46.51022-46.51022-46.510219z" fill="#FFFFFF" fill-opacity=".5" p-id="20004"></path><path d="M206.195307 333.32324c8.562531 0 15.503407-6.940875 15.503406-15.503407 0 8.562531 6.940875 15.503407 15.503407 15.503407-4.012282 0-15.503407 6.940875-15.503407 15.503406 0-8.562531-6.940875-15.503407-15.503406-15.503406z" fill="#FFFFFF" fill-opacity=".3" p-id="20005"></path><circle cx="320" cy="512" r="60" fill="#FFFFFF"/><circle cx="512" cy="320" r="60" fill="#FFFFFF"/><circle cx="512" cy="704" r="60" fill="#FFFFFF"/><circle cx="704" cy="512" r="60" fill="#FFFFFF"/><line x1="320" y1="512" x2="512" y2="320" stroke="#FFFFFF" stroke-width="24" stroke-linecap="round"/><line x1="320" y1="512" x2="512" y2="704" stroke="#FFFFFF" stroke-width="24" stroke-linecap="round"/><line x1="512" y1="704" x2="704" y2="512" stroke="#FFFFFF" stroke-width="24" stroke-linecap="round"/></svg>
diff --git a/src/static/icons/tree.svg b/src/static/icons/menu.svg
similarity index 60%
rename from src/static/icons/tree.svg
rename to src/static/icons/menu.svg
index bb29a92..1fef3d7 100644
--- a/src/static/icons/tree.svg
+++ b/src/static/icons/menu.svg
@@ -1,24 +1,13 @@
-<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200">
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200">
   <path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#67C23A"/>
   <path d="M324.408781 655.018925C505.290126 655.018925 651.918244 508.387706 651.918244 327.509463c0-152.138029-103.733293-280.047334-244.329811-316.853972C205.813923 52.463528 47.497011 213.017581 8.987325 415.981977 47.587706 553.880127 174.183098 655.018925 324.408781 655.018925z" fill="#FFFFFF" fill-opacity=".2"/>
   <path d="M512 1024c282.766631 0 512-229.233369 512-512 0-31.765705-2.891385-62.853911-8.433853-93.018889C928.057169 336.0999 809.874701 285.26268 679.824375 285.26268c-269.711213 0-488.357305 218.645317-488.357305 488.357305 0 54.959576 9.084221 107.802937 25.822474 157.10377C300.626556 989.489417 402.283167 1024 512 1024z" fill="#FFFFFF" fill-opacity=".15"/>
   <path d="M732.535958 756.566238c36.389596 0 65.889478-29.499882 65.889477-65.889478 0 36.389596 29.502983 65.889478 65.889478 65.889478-17.053747 0-65.889478 29.502983-65.889478 65.889477 0-36.386495-29.499882-65.889478-65.889477-65.889477zM159.685087 247.279334c25.686819 0 46.51022-20.8234 46.51022-46.51022 0 25.686819 20.8234 46.51022 46.510219 46.51022-12.03607 0-46.51022 20.8234-46.510219 46.510219 0-25.686819-20.8234-46.51022-46.51022-46.510219z" fill="#FFFFFF" fill-opacity=".5"/>
   <path d="M206.195307 333.32324c8.562531 0 15.503407-6.940875 15.503406-15.503407 0 8.562531 6.940875 15.503407 15.503407 15.503407-4.012282 0-15.503407 6.940875-15.503407 15.503406 0-8.562531-6.940875-15.503407-15.503406-15.503406z" fill="#FFFFFF" fill-opacity=".3"/>
-
-  <g>
-    <path d="M320 350H380" stroke="#FFFFFF" stroke-opacity=".85" stroke-width="14" stroke-linecap="round"/>
-    <path d="M380 350V690" stroke="#FFFFFF" stroke-opacity=".85" stroke-width="14" stroke-linecap="round"/>
-    <path d="M380 520H420" stroke="#FFFFFF" stroke-opacity=".85" stroke-width="14" stroke-linecap="round"/>
-    <path d="M380 690H460" stroke="#FFFFFF" stroke-opacity=".85" stroke-width="14" stroke-linecap="round"/>
-
-    <rect x="400" y="300" width="340" height="92" rx="28" fill="#FFFFFF"/>
-    <rect x="440" y="332" width="150" height="30" rx="15" fill="#95D475"/>
-
-    <rect x="440" y="470" width="300" height="92" rx="28" fill="#FFFFFF"/>
-    <rect x="480" y="502" width="130" height="30" rx="15" fill="#95D475"/>
-
-    <rect x="480" y="640" width="260" height="92" rx="28" fill="#FFFFFF"/>
-    <rect x="520" y="672" width="110" height="30" rx="15" fill="#95D475"/>
+  <g fill="#FFFFFF">
+    <rect x="272" y="272" width="220" height="220" rx="54"/>
+    <rect x="272" y="532" width="220" height="220" rx="54"/>
+    <rect x="532" y="532" width="220" height="220" rx="54"/>
   </g>
+  <rect x="550" y="290" width="184" height="184" rx="26" fill="#FFFFFF" transform="rotate(45 642 382)"/>
 </svg>
-
diff --git a/src/static/icons/repo.svg b/src/static/icons/repo.svg
new file mode 100644
index 0000000..6136f05
--- /dev/null
+++ b/src/static/icons/repo.svg
@@ -0,0 +1,10 @@
+<svg t="1773314000002" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200">
+  <path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#F05032"></path>
+  <path d="M324.408781 655.018925C505.290126 655.018925 651.918244 508.387706 651.918244 327.509463c0-152.138029-103.733293-280.047334-244.329811-316.853972C205.813923 52.463528 47.497011 213.017581 8.987325 415.981977 47.587706 553.880127 174.183098 655.018925 324.408781 655.018925z" fill="#FFFFFF" fill-opacity=".2"></path>
+  <path d="M512 1024c282.766631 0 512-229.233369 512-512 0-31.765705-2.891385-62.853911-8.433853-93.018889C928.057169 336.0999 809.874701 285.26268 679.824375 285.26268c-269.711213 0-488.357305 218.645317-488.357305 488.357305 0 54.959576 9.084221 107.802937 25.822474 157.10377C300.626556 989.489417 402.283167 1024 512 1024z" fill="#FFFFFF" fill-opacity=".15"></path>
+  <path d="M732.535958 756.566238c36.389596 0 65.889478-29.499882 65.889477-65.889478 0 36.389596 29.502983 65.889478 65.889478 65.889478-17.053747 0-65.889478 29.502983-65.889478 65.889477 0-36.386495-29.499882-65.889478-65.889477-65.889477zM159.685087 247.279334c25.686819 0 46.51022-20.8234 46.51022-46.51022 0 25.686819 20.8234 46.51022 46.510219 46.51022-12.03607 0-46.51022 20.8234-46.510219 46.510219 0-25.686819-20.8234-46.51022-46.51022-46.510219z" fill="#FFFFFF" fill-opacity=".5"></path>
+  <path d="M206.195307 333.32324c8.562531 0 15.503407-6.940875 15.503406-15.503407 0 8.562531 6.940875 15.503407 15.503407 15.503407-4.012282 0-15.503407 6.940875-15.503407 15.503406 0-8.562531-6.940875-15.503407-15.503406-15.503406z" fill="#FFFFFF" fill-opacity=".3"></path>
+  <g transform="translate(512 512) scale(24) translate(-12 -12)">
+    <path d="M13 14c-3.36 0-4.46 1.35-4.82 2.24C9.25 16.7 10 17.76 10 19a3 3 0 0 1-3 3a3 3 0 0 1-3-3c0-1.31.83-2.42 2-2.83V7.83A2.99 2.99 0 0 1 4 5a3 3 0 0 1 3-3a3 3 0 0 1 3 3c0 1.31-.83 2.42-2 2.83v5.29c.88-.65 2.16-1.12 4-1.12c2.67 0 3.56-1.34 3.85-2.23A3.01 3.01 0 0 1 14 7a3 3 0 0 1 3-3a3 3 0 0 1 3 3c0 1.34-.88 2.5-2.09 2.86C17.65 11.29 16.68 14 13 14m-6 4a1 1 0 0 0-1 1a1 1 0 0 0 1 1a1 1 0 0 0 1-1a1 1 0 0 0-1-1M7 4a1 1 0 0 0-1 1a1 1 0 0 0 1 1a1 1 0 0 0 1-1a1 1 0 0 0-1-1m10 2a1 1 0 0 0-1 1a1 1 0 0 0 1 1a1 1 0 0 0 1-1a1 1 0 0 0-1-1" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1" stroke-linejoin="round" stroke-linecap="round"/>
+  </g>
+</svg>
diff --git a/src/store/index.ts b/src/store/index.ts
index 8aa9068..043fb9f 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,13 +1,13 @@
-import type { App } from "vue";
+import type { App } from "vue";
 import { createPinia } from "pinia";
 
-const store = createPinia();
+const pinia = createPinia();
 
-// 全局注册 store
-export function setupStore(app: App<Element>) {
-  app.use(store);
+// 全局注册 Pinia
+export function setupPinia(app: App<Element>) {
+  app.use(pinia);
 }
 
 export * from "./modules/user";
 export * from "./modules/theme";
-export { store };
+export { pinia };
diff --git a/src/store/modules/theme.ts b/src/store/modules/theme.ts
index 9050acf..d08ae85 100644
--- a/src/store/modules/theme.ts
+++ b/src/store/modules/theme.ts
@@ -15,7 +15,7 @@ export type ThemeMode = "light" | "dark";
 
 /** 预定义的主题色选项 */
 export const themeColorOptions: ThemeColorOption[] = [
-  { name: "默认蓝", value: "blue", primary: "#4d80f0" },
+  { name: "默认蓝", value: "blue", primary: "#165DFF" },
   { name: "活力橙", value: "orange", primary: "#FF7D00" },
   { name: "薄荷绿", value: "green", primary: "#07C160" },
   { name: "樱花粉", value: "pink", primary: "#FF69B4" },
@@ -27,25 +27,16 @@ interface ProviderThemeVars extends ConfigProviderThemeVars {
   colorTheme: string;
 }
 
-/**
- * 主题状态管理 Store
- *
- * 功能说明：
- * - 主题模式切换（明/暗）
- * - 主题色定制
- * - 导航栏颜色同步
- */
+/** 主题状态管理 Store */
 
 export const useThemeStore = defineStore("theme", () => {
-  // ==========================================================================
   // 状态
-  // ==========================================================================
 
   /** 当前主题模式 */
-  const theme = ref<ThemeMode>(Storage.get<ThemeMode>(THEME_MODE_KEY, "light"));
+  const themeMode = ref<ThemeMode>(Storage.get<ThemeMode>(THEME_MODE_KEY, "light"));
 
-  /** 当前主题色 */
-  const currentThemeColor = ref<ThemeColorOption>(
+  /** 已选主题色选项 */
+  const selectedThemeColor = ref<ThemeColorOption>(
     Storage.get<ThemeColorOption>(THEME_COLOR_KEY, themeColorOptions[0])
   );
 
@@ -54,75 +45,77 @@ export const useThemeStore = defineStore("theme", () => {
    * 无需手动覆盖组件变量，这里只注入主题色
    */
   const themeVars = computed<ProviderThemeVars>(() => ({
-    colorTheme: currentThemeColor.value.primary,
+    colorTheme: selectedThemeColor.value.primary,
   }));
 
-  // ==========================================================================
   // 计算属性
-  // ==========================================================================
 
   /** 是否为暗黑模式 */
-  const isDark = computed(() => theme.value === "dark");
+  const isDark = computed(() => themeMode.value === "dark");
 
-  // ==========================================================================
   // 方法
-  // ==========================================================================
 
   /**
-   * 设置导航栏颜色
+   * 按当前主题状态同步导航栏颜色
    */
-  const setNavigationBarColor = () => {
+  const syncNavigationBarTheme = () => {
     uni.setNavigationBarColor({
-      frontColor: theme.value === "light" ? "#000000" : "#ffffff",
-      backgroundColor: theme.value === "light" ? "#ffffff" : "#1f2937",
+      frontColor: themeMode.value === "light" ? "#000000" : "#ffffff",
+      backgroundColor: themeMode.value === "light" ? "#ffffff" : "#1f2937",
     });
   };
 
   /**
-   * 切换主题
-   * @param mode 指定主题模式，不传则自动切换
+   * 设置主题模式
+   * @param mode 目标主题模式
    */
-  const toggleTheme = (mode?: ThemeMode) => {
-    theme.value = mode || (theme.value === "light" ? "dark" : "light");
-    Storage.set(THEME_MODE_KEY, theme.value);
-    setNavigationBarColor();
+  const setThemeMode = (mode: ThemeMode) => {
+    themeMode.value = mode;
+    Storage.set(THEME_MODE_KEY, mode);
+    syncNavigationBarTheme();
+  };
+
+  /**
+   * 在明暗两种模式间切换
+   */
+  const toggleThemeMode = () => {
+    setThemeMode(themeMode.value === "light" ? "dark" : "light");
   };
 
   /**
    * 设置主题色
    * @param color 主题色选项
    */
-  const setCurrentThemeColor = (color: ThemeColorOption) => {
-    currentThemeColor.value = color;
+  const setThemeColor = (color: ThemeColorOption) => {
+    selectedThemeColor.value = color;
     Storage.set(THEME_COLOR_KEY, color);
   };
 
   /**
-   * 初始化主题
+   * 初始化主题：同步导航栏（需等首个页面渲染完成，nextTick 保证时序）
    */
   const initTheme = () => {
     nextTick(() => {
-      setNavigationBarColor();
+      syncNavigationBarTheme();
     });
   };
 
-  // ==========================================================================
   // 导出
-  // ==========================================================================
 
   return {
     // 状态
-    theme,
-    currentThemeColor,
+    themeMode,
+    selectedThemeColor,
     themeVars,
 
     // 计算属性
     isDark,
 
     // 方法
-    toggleTheme,
-    setCurrentThemeColor,
-    setNavigationBarColor,
+    setThemeMode,
+    toggleThemeMode,
+    setThemeColor,
+    syncNavigationBarTheme,
     initTheme,
   };
 });
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index c274672..57fcbab 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,41 +1,61 @@
 import { defineStore } from "pinia";
 import AuthAPI, {
-  type LoginData,
-  type SmsLoginData,
-  type WxMaPhoneLoginData,
-  type WxMaBindMobileData,
+  type PasswordLoginParams,
+  type SmsLoginParams,
+  type WxMaPhoneLoginParams,
+  type WxMaBindMobileParams,
 } from "@/api/auth";
 import UserAPI, { type UserInfo } from "@/api/user";
-import { setAccessToken, clearTokens } from "@/utils/auth";
+import { setAccessToken as persistAccessToken, getAccessToken, clearTokens } from "@/utils/auth";
 import { Storage } from "@/utils/storage";
 import { USER_INFO_KEY } from "@/constants";
 
 /**
  * 用户状态管理 Store
  *
- * 功能说明：
- * - 用户登录/登出
- * - 用户信息管理
- * - 多种登录方式支持（密码、短信、微信小程序）
+ * 会话约定：
+ * - accessToken 是登录态的唯一事实来源（响应式），isAuthenticated 统一判断登录
+ * - setAccessToken 登录成功后集中写入；resetSession 同时清理内存与持久化（退出、登录失效共用）
  */
 
 export const useUserStore = defineStore("user", () => {
-  // ==========================================================================
   // 状态
-  // ==========================================================================
+
+  /** 访问令牌（响应式会话凭据，初始化时从持久化恢复） */
+  const accessToken = ref<string>(getAccessToken() || "");
 
   /** 用户信息 */
   const userInfo = ref<UserInfo | undefined>(Storage.get<UserInfo>(USER_INFO_KEY));
 
-  // ==========================================================================
+  /** 统一登录判断 */
+  const isAuthenticated = computed(() => !!accessToken.value);
+
+  /** 必填资料是否完善（昵称与头像齐备） */
+  const isProfileComplete = computed(() => !!(userInfo.value?.nickname && userInfo.value?.avatar));
+
+  // 会话管理
+
+  /** 登录成功后的集中写入（内存 + 持久化保持同步） */
+  function setAccessToken(token: string): void {
+    accessToken.value = token;
+    persistAccessToken(token);
+  }
+
+  /** 同时清理内存与持久化会话（退出登录、401 登录失效共用） */
+  function resetSession(): void {
+    accessToken.value = "";
+    userInfo.value = undefined;
+    clearTokens();
+    Storage.remove(USER_INFO_KEY);
+  }
+
   // 登录方法
-  // ==========================================================================
 
   /**
    * 账号密码登录
    */
-  const login = async (data: LoginData) => {
-    const result = await AuthAPI.login(data);
+  const loginByPassword = async (data: PasswordLoginParams) => {
+    const result = await AuthAPI.loginByPassword(data);
     setAccessToken(result.accessToken);
     return result;
   };
@@ -43,7 +63,7 @@ export const useUserStore = defineStore("user", () => {
   /**
    * 短信验证码登录
    */
-  const loginBySms = async (data: SmsLoginData) => {
+  const loginBySms = async (data: SmsLoginParams) => {
     const result = await AuthAPI.loginBySms(data);
     setAccessToken(result.accessToken);
     return result;
@@ -63,7 +83,7 @@ export const useUserStore = defineStore("user", () => {
   /**
    * 微信小程序一键登录（企业小程序）
    */
-  const loginByWxMaPhone = async (data: WxMaPhoneLoginData) => {
+  const loginByWxMaPhone = async (data: WxMaPhoneLoginParams) => {
     const result = await AuthAPI.wxMaPhoneLogin(data);
     setAccessToken(result.accessToken);
     return result;
@@ -72,53 +92,26 @@ export const useUserStore = defineStore("user", () => {
   /**
    * 微信小程序绑定手机号
    */
-  const bindMobileForWxMa = async (data: WxMaBindMobileData) => {
+  const bindMobileForWxMa = async (data: WxMaBindMobileParams) => {
     const result = await AuthAPI.wxMaBindMobile(data);
     setAccessToken(result.accessToken);
     return result;
   };
 
-  // ==========================================================================
-  // 扫码登录方法
-  // ==========================================================================
-
-  /**
-   * 标记已扫码
-   */
-  const qrScan = async (ticket: string) => {
-    return await AuthAPI.qrScan(ticket);
-  };
-
-  /**
-   * 确认 PC 端登录
-   */
-  const qrConfirm = async (ticket: string) => {
-    return await AuthAPI.qrConfirm(ticket);
-  };
-
-  /**
-   * 取消 PC 端登录
-   */
-  const qrCancel = async (ticket: string) => {
-    return await AuthAPI.qrCancel(ticket);
-  };
-
-  // ==========================================================================
   // 用户信息方法
-  // ==========================================================================
 
   /**
-   * 获取用户信息
+   * 加载当前登录用户信息（请求接口、更新响应式状态、写入存储）
    */
-  const getInfo = async () => {
-    const data = await UserAPI.getUserInfo();
+  const loadUserInfo = async () => {
+    const data = await UserAPI.getCurrentUser();
     Storage.set(USER_INFO_KEY, data);
     userInfo.value = data;
     return data;
   };
 
   /**
-   * 登出
+   * 登出：远端退出 + 本地清理（内存与持久化）+ 跳转登录页（唯一导航入口）
    */
   const logout = async () => {
     try {
@@ -126,37 +119,29 @@ export const useUserStore = defineStore("user", () => {
     } catch {
       // 登出失败静默处理，继续清理本地状态
     } finally {
-      clearTokens();
-      Storage.remove(USER_INFO_KEY);
-      userInfo.value = undefined;
+      resetSession();
       uni.reLaunch({ url: "/pages/login/index" });
     }
   };
 
-  /**
-   * 判断用户信息是否完整
-   */
-  const isUserInfoComplete = (): boolean => {
-    if (!userInfo.value) return false;
-    return !!(userInfo.value.nickname && userInfo.value.avatar);
-  };
-
-  // ==========================================================================
   // 导出
-  // ==========================================================================
 
   return {
+    // 状态与会话
+    accessToken,
     userInfo,
-    login,
+    isAuthenticated,
+    isProfileComplete,
+    setAccessToken,
+    resetSession,
+    // 登录
+    loginByPassword,
     loginBySms,
     loginByWxMa,
     loginByWxMaPhone,
     bindMobileForWxMa,
-    qrScan,
-    qrConfirm,
-    qrCancel,
+    // 用户信息
     logout,
-    getInfo,
-    isUserInfoComplete,
+    loadUserInfo,
   };
 });
diff --git a/src/styles/index.scss b/src/styles/index.scss
index e2ab8a9..0bd4115 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -5,7 +5,7 @@ page {
   font-size: 28rpx;
   line-height: 1.6;
   color: var(--color-text);
-  background-color: var(--color-bg);
+  background-color: var(--color-bg-page);
 }
 
 // H5 端字体平滑渲染
@@ -40,7 +40,7 @@ body {
   box-sizing: border-box;
   min-height: 100vh;
   padding: 16rpx 32rpx 0;
-  background-color: var(--color-bg-secondary);
+  background-color: var(--color-bg-page);
 }
 
 .page--tabbar {
@@ -54,7 +54,7 @@ body {
   height: 72rpx;
   margin-top: 16rpx;
   overflow: hidden;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border-radius: 16rpx;
 
   .wd-drop-menu {
@@ -103,19 +103,16 @@ body {
   text-align: center;
 }
 
-// 列表页悬浮新增按钮（wd-fab 的 trigger 插槽）
+// 列表页悬浮新增按钮（wd-fab 的 trigger 插槽）：纯图标圆形按钮
 .work-fab-trigger {
   display: flex;
-  gap: 8rpx;
   align-items: center;
   justify-content: center;
-  height: 88rpx;
-  padding: 0 44rpx;
-  font-size: 28rpx;
-  font-weight: 600;
+  width: 96rpx;
+  height: 96rpx;
   color: var(--color-text-inverse);
   background: var(--color-primary);
-  border-radius: 999rpx;
+  border-radius: 50%;
   box-shadow: var(--shadow-lg);
 
   &:active {
@@ -135,7 +132,7 @@ body {
 }
 
 .item-action--hover {
-  background: rgba(var(--color-text-placeholder-rgb, 148, 163, 184), 0.16);
+  background: rgba(var(--color-text-placeholder-rgb), 0.16);
 }
 
 // 列表卡片底部时间戳
@@ -144,4 +141,29 @@ body {
   color: var(--color-text-placeholder);
 }
 
+// 语义色工具类：unocss 只生成 bg-/text-/border- 前缀，color-* 系列统一在这里提供
+.color-primary {
+  color: var(--color-primary);
+}
+
+.color-success {
+  color: var(--color-success);
+}
+
+.color-warning {
+  color: var(--color-warning);
+}
+
+.color-danger {
+  color: var(--color-danger);
+}
+
+.color-text-secondary {
+  color: var(--color-text-secondary);
+}
+
+.color-text-placeholder {
+  color: var(--color-text-placeholder);
+}
+
 
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 0e0a8f3..a2b583f 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -1,162 +1,133 @@
-// ==========================================================================
-// 主题变量系统
-// ==========================================================================
-// 遵循文档规范，提供完整的明暗主题支持
-// 使用 CSS 变量实现主题切换，支持 wot-design-uni 组件库
+// 明暗主题 CSS 变量，随 wot-design-uni 的 .wot-theme-dark 类切换
 
-// ==========================================================================
-// 默认主题 (light)
-// ==========================================================================
+// 浅色主题
 :root,
 page {
-  // -----------------------------------------------------------------------
-  // z-index 层级变量
-  // -----------------------------------------------------------------------
   --z-dropdown: 100;
   --z-sticky: 200;
   --z-navbar: 700;
 
-  // -----------------------------------------------------------------------
-  // 主题色
-  // -----------------------------------------------------------------------
-  --color-primary: #4d80f0;
-  --color-primary-light: #e8f0fe;
-  --color-primary-dark: #2563eb;
-  --color-success: #34d19d;
-  --color-success-light: #e6f7f1;
-  --color-warning: #f0883a;
-  --color-warning-light: #fff4e6;
-  --color-danger: #ff4757;
-  --color-danger-light: #fff1f2;
-  --color-info: #3b82f6;
-  --color-info-light: #dbeafe;
+  // 组件内分层：底图 0 < 遮罩 1 < 内容 2
+  --z-base: 0;
+  --z-mask: 1;
+  --z-content: 2;
+
+  // 语义色取 Arco 色板基色，-light 为配套的 90% 白浅底
+  --color-primary: #165dff;
+  --color-primary-light: #e8efff;
+  --color-success: #00b42a;
+  --color-success-light: #e6f8ea;
+  --color-warning: #ff7d00;
+  --color-warning-light: #fff2e6;
+  --color-danger: #f53f3f;
+  --color-danger-light: #feecec;
+  --color-info: #86909c;
+  --color-info-light: #f3f4f5;
   --color-wx-green: #22c55e;
 
-  // -----------------------------------------------------------------------
-  // 背景色 (Material Design)
-  // -----------------------------------------------------------------------
-  --color-bg: #ffffff;
-  --color-bg-secondary: #f5f5f5;
-  --color-bg-tertiary: #f1f5f9;
+  --color-bg-card: #ffffff;
+  // 页面底（Arco gray-1，带冷调的浅灰）
+  --color-bg-page: #f7f8fa;
 
-  // -----------------------------------------------------------------------
-  // 文字颜色
-  // -----------------------------------------------------------------------
   --color-text: #1f2937;
-  --color-text-secondary: #6b7280;
-  --color-text-placeholder: #9ca3af;
-  --color-text-disabled: #d1d5db;
+  --color-text-secondary: #86909c;
+  --color-text-placeholder: #a9aeb8;
+  // 占位色 RGB 分量，供 rgba() 叠加使用（CSS 变量不能直接参与 rgba 计算）
+  --color-text-placeholder-rgb: 169, 174, 184;
   --color-text-inverse: #ffffff;
 
-  // -----------------------------------------------------------------------
-  // 边框颜色
-  // -----------------------------------------------------------------------
   --color-border: #e5e7eb;
   --color-border-light: #f3f4f6;
-  --color-border-dark: #d1d5db;
   --color-border-glass: rgba(148, 163, 184, 0.22);
   --color-border-glass-strong: rgba(255, 255, 255, 0.9);
-  --color-danger-shadow: rgba(239, 68, 68, 0.08);
 
-  // -----------------------------------------------------------------------
-  // 毛玻璃效果色
-  // -----------------------------------------------------------------------
   --color-glass: rgba(255, 255, 255, 0.22);
   --color-glass-light: rgba(255, 255, 255, 0.12);
-  --color-bg-alpha-95: rgba(255, 255, 255, 0.95);
+  --color-bg-card-alpha-95: rgba(255, 255, 255, 0.95);
 
-  // -----------------------------------------------------------------------
-  // 主题色透明度变体
-  // -----------------------------------------------------------------------
-  --color-primary-alpha-20: rgba(77, 128, 240, 0.2);
-  --color-primary-alpha-15: rgba(77, 128, 240, 0.15);
+  // 填充（Arco fill 轨道）：卡片内的槽位，独立于页面底
+  --color-fill-1: #f2f3f5;
+  --color-fill-2: #e5e6eb;
+
+  // 底图遮罩：浅色主题提亮底图
+  --color-media-mask: rgba(255, 255, 255, 0.22);
+  --color-media-mask-light: rgba(255, 255, 255, 0.12);
+
+  --color-primary-alpha-20: rgba(22, 93, 255, 0.2);
+  --color-primary-alpha-15: rgba(22, 93, 255, 0.15);
 
-  // -----------------------------------------------------------------------
-  // 阴影
-  // -----------------------------------------------------------------------
   --shadow-sm: 0 2rpx 4rpx rgba(0, 0, 0, 0.05);
   --shadow-md: 0 8rpx 12rpx rgba(0, 0, 0, 0.1);
   --shadow-lg: 0 20rpx 30rpx rgba(0, 0, 0, 0.1);
+  // 登录卡、扫码卡这类悬浮容器的柔和投影
+  --shadow-float: 0 20rpx 50rpx -10rpx rgba(0, 0, 0, 0.1);
 
-  // -----------------------------------------------------------------------
-  // 以下只保留主色调自定义，其余交给 Wot UI 官方主题
-  // -----------------------------------------------------------------------
+  // 加载/操作遮罩层
+  --color-overlay: rgba(15, 23, 42, 0.6);
+
+  // 仅覆盖主色、按钮圆角、单元格点击态与 fab 层级，其余交给 Wot UI 官方主题
   --wot-color-theme: var(--color-primary);
+  // wot 按钮默认 4px 圆角偏方，统一到与卡片一致的 24rpx
+  --wot-button-radius-main: 24rpx;
+  // 单元格点击态统一走项目填充色，避免各页面用 :deep 加 !important 硬压
+  --wot-cell-bg-active: var(--color-fill-2);
   --wot-fab-z-index: 999;
 }
 
-// ==========================================================================
-// 暗黑主题 (dark)
-// ==========================================================================
+// 暗色主题
 .wot-theme-dark {
-  // -----------------------------------------------------------------------
-  // 主题色
-  // -----------------------------------------------------------------------
-  --color-primary: #3b82f6;
-  --color-primary-light: #1e3a5f;
-  --color-primary-dark: #60a5fa;
-  --color-success: #34d399;
-  --color-success-light: #064e3b;
-  --color-warning: #fbbf24;
-  --color-warning-light: #78350f;
-  --color-danger: #f87171;
-  --color-danger-light: #7f1d1d;
-  --color-info: #60a5fa;
-  --color-info-light: #1e3a5f;
-  --color-wx-green: #22c55e;
+  // 基色与浅色主题一致，-light 转为 90% 深色底
+  --color-primary: #165dff;
+  --color-primary-light: #151c2c;
+  --color-success: #00b42a;
+  --color-success-light: #122417;
+  --color-warning: #ff7d00;
+  --color-warning-light: #2c1f12;
+  --color-danger: #f53f3f;
+  --color-danger-light: #2b1919;
+  --color-info: #86909c;
+  --color-info-light: #202122;
 
-  // -----------------------------------------------------------------------
-  // 背景色 (Material Design) - 不使用纯黑 #000000
-  // -----------------------------------------------------------------------
-  --color-bg: #1f2937;
-  --color-bg-secondary: #111827;
-  --color-bg-tertiary: #1e293b;
+  --color-bg-card: #1f2937;
+  // 深色页面底（gray-900）
+  --color-bg-page: #111827;
 
-  // -----------------------------------------------------------------------
-  // 文字颜色
-  // -----------------------------------------------------------------------
   --color-text: #f9fafb;
-  --color-text-secondary: #9ca3af;
-  --color-text-placeholder: #6b7280;
-  --color-text-disabled: #4b5563;
-  --color-text-inverse: #ffffff;
+  --color-text-secondary: #a9aeb8;
+  --color-text-placeholder: #86909c;
+  // 占位色 RGB 分量，供 rgba() 叠加使用
+  --color-text-placeholder-rgb: 134, 144, 156;
 
-  // -----------------------------------------------------------------------
-  // 边框颜色
-  // -----------------------------------------------------------------------
   --color-border: #374151;
   --color-border-light: #1f2937;
-  --color-border-dark: #4b5563;
   --color-border-glass: rgba(148, 163, 184, 0.15);
-  --color-border-glass-strong: rgba(255, 255, 255, 0.9);
-  --color-danger-shadow: rgba(239, 68, 68, 0.15);
 
-  // -----------------------------------------------------------------------
-  // 毛玻璃效果色
-  // -----------------------------------------------------------------------
   --color-glass: rgba(255, 255, 255, 0.12);
   --color-glass-light: rgba(255, 255, 255, 0.06);
-  --color-bg-alpha-95: rgba(31, 41, 55, 0.95);
+  --color-bg-card-alpha-95: rgba(31, 41, 55, 0.95);
 
-  // -----------------------------------------------------------------------
-  // 主题色透明度变体
-  // -----------------------------------------------------------------------
-  --color-primary-alpha-20: rgba(59, 130, 246, 0.2);
-  --color-primary-alpha-15: rgba(59, 130, 246, 0.15);
+  // 填充（Arco fill 轨道）：fill-1 沉到页面底，fill-2 为按下态与灰底悬浮
+  --color-fill-1: #111827;
+  --color-fill-2: #1e293b;
+
+  // 底图遮罩：深色主题压暗固定底图，保证图上浅色文字可读
+  // 平铺不渐变：渐变亮带会正好压在描述文字上，导致对比度不足
+  --color-media-mask: rgba(17, 24, 39, 0.82);
+  --color-media-mask-light: rgba(17, 24, 39, 0.82);
+
+  --color-primary-alpha-20: rgba(22, 93, 255, 0.2);
+  --color-primary-alpha-15: rgba(22, 93, 255, 0.15);
 
-  // -----------------------------------------------------------------------
-  // 阴影
-  // -----------------------------------------------------------------------
   --shadow-sm: 0 2rpx 4rpx rgba(0, 0, 0, 0.2);
   --shadow-md: 0 8rpx 12rpx rgba(0, 0, 0, 0.3);
   --shadow-lg: 0 20rpx 30rpx rgba(0, 0, 0, 0.4);
+  --shadow-float: 0 20rpx 50rpx -10rpx rgba(0, 0, 0, 0.4);
+
+  // 加载/操作遮罩层
+  --color-overlay: rgba(0, 0, 0, 0.72);
 
-  // -----------------------------------------------------------------------
-  // 以下只保留主色调自定义，其余交给 Wot UI 官方暗黑模式
-  // -----------------------------------------------------------------------
   --wot-color-theme: var(--color-primary);
 
-  // Wot UI 的 card / cell / input / grid / popup 等 40+ 组件默认用纯黑填充，
-  // 与项目 --color-bg（深蓝灰）产生色差。统一指向项目主背景。
-  --wot-filled-oppo: var(--color-bg);
+  // card / cell / grid / popup 等组件的填充色 --wot-filled-oppo 由 app-provider 内联覆盖，
+  // 写在这里不生效（wot 组件自身样式优先级高于 app.wxss）
 }
diff --git a/src/subPages/mine/about/index.vue b/src/subPages/mine/about/index.vue
index 896788c..2f63465 100644
--- a/src/subPages/mine/about/index.vue
+++ b/src/subPages/mine/about/index.vue
@@ -19,32 +19,29 @@
       </view>
     </wd-card>
 
-    <wd-card title="仓库" custom-style="margin-top: 20rpx">
+    <wd-card title="仓库" class="mt-20rpx">
       <wd-collapse v-model="collapseActive" accordion>
         <wd-collapse-item title="Web 前端" name="web">
           <wd-cell-group border>
             <wd-cell
               title="vue3-element-admin"
               icon="desktop"
-              title-width="400rpx"
-              value="简介"
               clickable
+              is-link
               @click="openProjectIntro('vue3-element-admin')"
             />
             <wd-cell
               title="vue3-element-admin-js"
               icon="desktop"
-              title-width="400rpx"
-              value="简介"
               clickable
+              is-link
               @click="openProjectIntro('vue3-element-admin-js')"
             />
             <wd-cell
               title="vue3-element-template"
               icon="desktop"
-              title-width="400rpx"
-              value="简介"
               clickable
+              is-link
               @click="openProjectIntro('vue3-element-template')"
             />
           </wd-cell-group>
@@ -55,9 +52,8 @@
             <wd-cell
               title="youlai-app"
               icon="mobile"
-              title-width="400rpx"
-              value="简介"
               clickable
+              is-link
               @click="openProjectIntro('youlai-app')"
             />
           </wd-cell-group>
@@ -67,50 +63,44 @@
           <wd-cell-group border>
             <wd-cell
               title="youlai-boot"
-              icon="server"
-              title-width="400rpx"
-              value="简介"
+              icon="cloud"
               clickable
+              is-link
               @click="openProjectIntro('youlai-boot')"
             />
             <wd-cell
               title="youlai-gin"
-              icon="server"
-              title-width="400rpx"
-              value="简介"
+              icon="cloud"
               clickable
+              is-link
               @click="openProjectIntro('youlai-gin')"
             />
             <wd-cell
               title="youlai-nest"
-              icon="server"
-              title-width="400rpx"
-              value="简介"
+              icon="cloud"
               clickable
+              is-link
               @click="openProjectIntro('youlai-nest')"
             />
             <wd-cell
               title="youlai-django"
-              icon="server"
-              title-width="400rpx"
-              value="简介"
+              icon="cloud"
               clickable
+              is-link
               @click="openProjectIntro('youlai-django')"
             />
             <wd-cell
               title="youlai-think"
-              icon="server"
-              title-width="400rpx"
-              value="简介"
+              icon="cloud"
               clickable
+              is-link
               @click="openProjectIntro('youlai-think')"
             />
             <wd-cell
               title="youlai-aspnet"
-              icon="server"
-              title-width="400rpx"
-              value="简介"
+              icon="cloud"
               clickable
+              is-link
               @click="openProjectIntro('youlai-aspnet')"
             />
           </wd-cell-group>
@@ -120,10 +110,9 @@
           <wd-cell-group border>
             <wd-cell
               title="youlai-boot-tenant"
-              icon="server"
-              title-width="400rpx"
-              value="简介"
+              icon="cloud"
               clickable
+              is-link
               @click="openProjectIntro('youlai-boot-tenant')"
             />
           </wd-cell-group>
@@ -131,7 +120,7 @@
       </wd-collapse>
     </wd-card>
 
-    <wd-card title="联系我们" custom-style="margin-top: 20rpx">
+    <wd-card title="联系我们" class="mt-20rpx">
       <wd-cell-group border>
         <wd-cell
           title="官方网站"
@@ -143,14 +132,14 @@
         <wd-cell
           title="GitHub"
           value="github.com/youlaitech"
-          icon="github"
+          icon="link"
           clickable
           @click="openUrl('https://github.com/youlaitech')"
         />
         <wd-cell
           title="联系邮箱"
           value="youlaitech@163.com"
-          icon="mail"
+          icon="email"
           clickable
           @click="copyText('youlaitech@163.com')"
         />
@@ -180,6 +169,11 @@
 </template>
 
 <script lang="ts" setup>
+definePage({
+  name: "about",
+  style: { navigationBarTitleText: "关于系统" },
+});
+
 const version = ref(import.meta.env.VITE_APP_VERSION);
 const collapseActive = ref<string[]>(["web"]);
 
@@ -316,9 +310,10 @@ const copyText = (text: string) => {
 
 onMounted(() => {
   // #ifdef MP-WEIXIN
-  const appVersion = uni.getSystemInfoSync().appVersion;
-  if (appVersion) {
-    version.value = appVersion;
+  const appBaseInfo =
+    typeof uni.getAppBaseInfo === "function" ? uni.getAppBaseInfo() : uni.getSystemInfoSync();
+  if (appBaseInfo.appVersion) {
+    version.value = appBaseInfo.appVersion;
   }
   // #endif
 });
@@ -336,24 +331,27 @@ onMounted(() => {
 
 .about__header {
   display: flex;
+  flex-direction: column;
   align-items: center;
-  padding: 20rpx;
+  padding: 40rpx 28rpx 28rpx;
 }
 
 .about__logo {
-  width: 120rpx;
-  height: 120rpx;
-  margin-right: 16rpx;
+  width: 140rpx;
+  height: 140rpx;
+  margin-bottom: 20rpx;
 }
 
 .about__info {
-  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
 .about__app-title {
   display: block;
   margin-bottom: 8rpx;
-  font-size: 32rpx;
+  font-size: 36rpx;
   font-weight: 700;
 }
 
@@ -378,7 +376,7 @@ onMounted(() => {
 }
 
 .about__intro {
-  padding: 0 20rpx 20rpx;
+  padding: 0 28rpx 28rpx;
 }
 
 .about__footer {
diff --git a/src/subPages/mine/account/index.vue b/src/subPages/mine/account/index.vue
index ce467ba..34fa95c 100644
--- a/src/subPages/mine/account/index.vue
+++ b/src/subPages/mine/account/index.vue
@@ -3,7 +3,7 @@
     <wd-card>
       <wd-cell-group border>
         <wd-cell
-          icon="secured"
+          icon="safe"
           title="账户密码"
           value="修改"
           is-link
@@ -17,14 +17,14 @@
           @click="handleOpenDialog(DialogType.MOBILE)"
         />
         <wd-cell
-          icon="mail"
+          icon="email"
           title="绑定邮箱"
           :value="userProfile?.email ? userProfile.email : '未绑定邮箱'"
           is-link
           @click="handleOpenDialog(DialogType.EMAIL)"
         />
         <!-- #ifdef MP-WEIXIN -->
-        <wd-cell icon="wechat" title="微信" value="解绑" is-link @click="handleUnbindWechat" />
+        <wd-cell icon="message" title="微信" value="解绑" is-link @click="handleUnbindWechat" />
         <!-- #endif -->
       </wd-cell-group>
     </wd-card>
@@ -39,39 +39,35 @@
         v-if="dialog.type === DialogType.PASSWORD"
         ref="passwordChangeFormRef"
         :model="passwordChangeForm"
-        custom-class="edit-form"
+        :schema="passwordRules"
+        title-width="160rpx"
+        custom-class="pt-40rpx"
       >
         <wd-cell-group border>
-          <wd-input
-            v-model="passwordChangeForm.oldPassword"
-            label="原密码"
-            label-width="160rpx"
-            show-password
-            clearable
-            placeholder="请输入原密码"
-            prop="oldPassword"
-            :rules="rules.oldPassword"
-          />
-          <wd-input
-            v-model="passwordChangeForm.newPassword"
-            label="新密码"
-            label-width="160rpx"
-            show-password
-            clearable
-            placeholder="请输入新密码"
-            prop="newPassword"
-            :rules="rules.newPassword"
-          />
-          <wd-input
-            v-model="passwordChangeForm.confirmPassword"
-            label="确认密码"
-            label-width="160rpx"
-            show-password
-            clearable
-            placeholder="请确认新密码"
-            prop="confirmPassword"
-            :rules="rules.confirmPassword"
-          />
+          <wd-form-item prop="oldPassword" title="原密码" required>
+            <wd-input
+              v-model="passwordChangeForm.oldPassword"
+              show-password
+              clearable
+              placeholder="请输入原密码"
+            />
+          </wd-form-item>
+          <wd-form-item prop="newPassword" title="新密码" required>
+            <wd-input
+              v-model="passwordChangeForm.newPassword"
+              show-password
+              clearable
+              placeholder="请输入新密码"
+            />
+          </wd-form-item>
+          <wd-form-item prop="confirmPassword" title="确认密码" required>
+            <wd-input
+              v-model="passwordChangeForm.confirmPassword"
+              show-password
+              clearable
+              placeholder="请确认新密码"
+            />
+          </wd-form-item>
         </wd-cell-group>
         <view class="p-24rpx">
           <wd-button size="large" block @click="handleSubmit">提交</wd-button>
@@ -81,38 +77,28 @@
         v-if="dialog.type === DialogType.MOBILE"
         ref="mobileBindingFormRef"
         :model="mobileBindingForm"
-        custom-class="edit-form"
+        :schema="mobileRules"
+        title-width="160rpx"
+        custom-class="pt-40rpx"
       >
         <wd-cell-group border>
-          <wd-input
-            v-model="mobileBindingForm.mobile"
-            label="手机号码"
-            label-width="160rpx"
-            clearable
-            placeholder="请输入手机号码"
-            prop="mobile"
-            :rules="rules.mobile"
-          />
-          <wd-input
-            v-model="mobileBindingForm.code"
-            label="验证码"
-            label-width="160rpx"
-            clearable
-            placeholder="请输入验证码"
-            prop="code"
-            :rules="rules.code"
-          >
-            <template #suffix>
-              <wd-button
-                type=""
-                plain
-                :disabled="mobileCountdown > 0"
-                @click="handleSendVerificationCode('MOBILE')"
-              >
-                {{ mobileCountdown > 0 ? `${mobileCountdown}s后重新发送` : "发送验证码" }}
-              </wd-button>
-            </template>
-          </wd-input>
+          <wd-form-item prop="mobile" title="手机号码" required>
+            <wd-input v-model="mobileBindingForm.mobile" clearable placeholder="请输入手机号码" />
+          </wd-form-item>
+          <wd-form-item prop="code" title="验证码" required>
+            <wd-input v-model="mobileBindingForm.code" clearable placeholder="请输入验证码">
+              <template #suffix>
+                <wd-button
+                  type=""
+                  plain
+                  :disabled="mobileCountdown > 0"
+                  @click="handleSendVerificationCode('MOBILE')"
+                >
+                  {{ mobileCountdown > 0 ? `${mobileCountdown}s后重新发送` : "发送验证码" }}
+                </wd-button>
+              </template>
+            </wd-input>
+          </wd-form-item>
         </wd-cell-group>
         <view class="p-24rpx">
           <wd-button size="large" block @click="handleSubmit">提交</wd-button>
@@ -122,38 +108,28 @@
         v-if="dialog.type === DialogType.EMAIL"
         ref="emailBindingFormRef"
         :model="emailBindingForm"
-        custom-class="edit-form"
+        :schema="emailRules"
+        title-width="160rpx"
+        custom-class="pt-40rpx"
       >
         <wd-cell-group border>
-          <wd-input
-            v-model="emailBindingForm.email"
-            label="邮箱"
-            label-width="160rpx"
-            clearable
-            placeholder="请输入邮箱"
-            prop="email"
-            :rules="rules.email"
-          />
-          <wd-input
-            v-model="emailBindingForm.code"
-            label="验证码"
-            label-width="160rpx"
-            clearable
-            placeholder="请输入验证码"
-            prop="code"
-            :rules="rules.code"
-          >
-            <template #suffix>
-              <wd-button
-                type=""
-                plain
-                :disabled="emailCountdown > 0"
-                @click="handleSendVerificationCode('EMAIL')"
-              >
-                {{ emailCountdown > 0 ? `${emailCountdown}s后重新发送` : "发送验证码" }}
-              </wd-button>
-            </template>
-          </wd-input>
+          <wd-form-item prop="email" title="邮箱" required>
+            <wd-input v-model="emailBindingForm.email" clearable placeholder="请输入邮箱" />
+          </wd-form-item>
+          <wd-form-item prop="code" title="验证码" required>
+            <wd-input v-model="emailBindingForm.code" clearable placeholder="请输入验证码">
+              <template #suffix>
+                <wd-button
+                  type=""
+                  plain
+                  :disabled="emailCountdown > 0"
+                  @click="handleSendVerificationCode('EMAIL')"
+                >
+                  {{ emailCountdown > 0 ? `${emailCountdown}s后重新发送` : "发送验证码" }}
+                </wd-button>
+              </template>
+            </wd-input>
+          </wd-form-item>
         </wd-cell-group>
         <view class="p-24rpx">
           <wd-button size="large" block @click="handleSubmit">提交</wd-button>
@@ -166,7 +142,8 @@
 import { onMounted, reactive, ref } from "vue";
 import { useToast, useDialog } from "@wot-ui/ui";
 import { useCountdown } from "@/composables/useCountdown";
-import { getErrorMessage } from "@/utils";
+import { getErrorMessage } from "@/utils/error";
+import { toFormSchema } from "@/utils/form-schema";
 import UserAPI, {
   PasswordChangeForm,
   MobileBindingForm,
@@ -174,27 +151,33 @@ import UserAPI, {
   UserProfile,
 } from "@/api/user";
 
+definePage({
+  name: "account",
+  style: { navigationBarTitleText: "账号安全" },
+});
+
 const toast = useToast();
 const { confirm } = useDialog();
 
-const validatorConfirmPassword = (value: string) => {
-  if (!value) {
-    return Promise.reject("请确认密码");
-  } else {
-    if (value !== passwordChangeForm.newPassword) {
-      return Promise.reject("两次输入的密码不一致");
-    } else {
-      return Promise.resolve();
-    }
-  }
-};
-// 本页面中所有的校验规则
-const rules = reactive({
+// 本页面中所有的校验规则（三个弹窗表单分别绑定）
+const passwordRules = toFormSchema({
   oldPassword: [{ required: true, message: "请填写原密码" }],
   newPassword: [{ required: true, message: "请填写新密码" }],
-  confirmPassword: [{ required: true, message: "请确认密码", validator: validatorConfirmPassword }],
+  confirmPassword: [
+    {
+      required: true,
+      message: "请确认密码",
+      validator: (value, model) => value === model.newPassword || "两次输入的密码不一致",
+    },
+  ],
+});
+
+const mobileRules = toFormSchema({
   mobile: [{ required: true, pattern: /^1[3-9]\d{9}$/, message: "请填写正确的手机号码" }],
   code: [{ required: true, message: "请填写验证码" }],
+});
+
+const emailRules = toFormSchema({
   email: [
     {
       required: true,
@@ -202,6 +185,7 @@ const rules = reactive({
       message: "请填写正确的邮箱地址",
     },
   ],
+  code: [{ required: true, message: "请填写验证码" }],
 });
 
 enum DialogType {
diff --git a/src/subPages/mine/official/index.vue b/src/subPages/mine/official/index.vue
index 6349d72..21b9de7 100644
--- a/src/subPages/mine/official/index.vue
+++ b/src/subPages/mine/official/index.vue
@@ -2,13 +2,13 @@
   <view>
     <view class="brand">
       <image src="/static/images/logo.png" class="brand__logo" mode="aspectFit" />
-      <view class="brand__text">
+      <view class="flex-1 min-w-0">
         <view class="brand__title">有来技术</view>
         <view class="brand__desc">让开源项目更加易用</view>
       </view>
     </view>
 
-    <view class="tip">
+    <view class="official-tip">
       长按识别下方二维码，关注「有来技术」公众号，获取最新技术分享和项目动态。
     </view>
 
@@ -39,9 +39,9 @@ onLoad(() => {
   gap: 20rpx;
   align-items: center;
   padding: 28rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border-radius: 20rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+  box-shadow: var(--shadow-sm);
 }
 
 .brand__logo {
@@ -50,11 +50,6 @@ onLoad(() => {
   border-radius: 20rpx;
 }
 
-.brand__text {
-  flex: 1;
-  min-width: 0;
-}
-
 .brand__title {
   font-size: 34rpx;
   font-weight: 700;
@@ -67,22 +62,22 @@ onLoad(() => {
   color: var(--color-text-secondary);
 }
 
-.tip {
+.official-tip {
   padding: 20rpx;
   margin-top: 20rpx;
   font-size: 26rpx;
   line-height: 1.6;
   color: var(--color-text);
-  background: var(--color-bg-tertiary);
+  background: var(--color-fill-1);
   border-radius: 16rpx;
 }
 
 .qrcode-card {
   padding: 28rpx;
   margin-top: 24rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border-radius: 20rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+  box-shadow: var(--shadow-sm);
 }
 
 .qrcode-card__img {
diff --git a/src/subPages/mine/profile/complete-profile/index.vue b/src/subPages/mine/profile/complete-profile/index.vue
index a24500d..3e1d6ab 100644
--- a/src/subPages/mine/profile/complete-profile/index.vue
+++ b/src/subPages/mine/profile/complete-profile/index.vue
@@ -1,14 +1,14 @@
 <template>
   <view>
     <!-- 头部 -->
-    <view class="complete-profile__hero">
+    <view class="mb-60rpx text-center">
       <view class="complete-profile__hero-title">完善个人信息</view>
       <view class="complete-profile__hero-subtitle">为了给您提供更好的服务，请完善以下信息</view>
     </view>
 
     <!-- 表单 -->
     <view class="profile-form">
-      <wd-form ref="profileFormRef" :model="profileForm">
+      <wd-form ref="profileFormRef" :model="profileForm" :schema="formRules">
         <!-- 头像 -->
         <view class="profile-form__section">
           <view class="profile-form__label">头像</view>
@@ -68,8 +68,6 @@
           <wd-input
             v-model="profileForm.nickname"
             placeholder="请输入昵称"
-            prop="nickname"
-            :rules="rules.nickname"
             custom-class="profile-form__nickname-input"
           />
           <!-- #endif -->
@@ -131,10 +129,16 @@ import { ref, reactive, computed } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import { useDialog, useToast } from "@wot-ui/ui";
 import { useUserStore } from "@/store";
-import { getErrorMessage } from "@/utils";
+import { getErrorMessage } from "@/utils/error";
+import { toFormSchema } from "@/utils/form-schema";
 import UserAPI, { type UserProfileForm } from "@/api/user";
 import FileAPI, { type FileInfo } from "@/api/file";
 
+definePage({
+  name: "complete-profile",
+  style: { navigationBarTitleText: "完善信息" },
+});
+
 const toast = useToast();
 const { confirm } = useDialog();
 const userStore = useUserStore();
@@ -148,12 +152,14 @@ const profileForm = reactive<UserProfileForm & { mobile?: string }>({
   mobile: "",
 });
 
-const rules = {
+// 本页面为自定义布局（无 wd-form-item），校验结果以 toast 呈现
+const formRules = toFormSchema({
   nickname: [
     { required: true, message: "请输入昵称" },
-    { required: true, min: 2, max: 20, message: "昵称长度为2-20个字符" },
+    { min: 2, max: 20, message: "昵称长度为2-20个字符" },
   ],
-};
+  mobile: [{ required: true, pattern: /^1[3-9]\d{9}$/, message: "请填写正确的手机号" }],
+});
 
 const isLoading = ref(false);
 const cropperVisible = ref(false);
@@ -227,11 +233,9 @@ const handleAvatarConfirm = async (event: ImgCropperConfirmEvent) => {
 
 const handleComplete = async () => {
   try {
-    const { valid } = await profileFormRef.value.validate();
-    if (!valid) return;
-
-    if (!profileForm.mobile) {
-      toast.error("请输入手机号");
+    const { valid, errors } = await profileFormRef.value.validate();
+    if (!valid) {
+      toast.error(errors[0]?.message || "请完善表单信息");
       return;
     }
 
@@ -243,11 +247,9 @@ const handleComplete = async () => {
       gender: profileForm.gender,
     });
 
-    if (profileForm.mobile) {
-      await UserAPI.bindMobile({ mobile: profileForm.mobile });
-    }
+    await UserAPI.bindMobile({ mobile: profileForm.mobile });
 
-    await userStore.getInfo();
+    await userStore.loadUserInfo();
     toast.success("信息完善成功");
 
     setTimeout(() => {
@@ -275,11 +277,6 @@ const handleSkip = async () => {
 </script>
 
 <style lang="scss" scoped>
-.complete-profile__hero {
-  margin-bottom: 60rpx;
-  text-align: center;
-}
-
 .complete-profile__hero-title {
   margin-bottom: 20rpx;
   font-size: 48rpx;
@@ -296,7 +293,7 @@ const handleSkip = async () => {
 .profile-form {
   padding: 40rpx;
   margin-bottom: 40rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border-radius: 24rpx;
   box-shadow: 0 8rpx 40rpx rgba(0, 0, 0, 0.1);
 
@@ -322,7 +319,7 @@ const handleSkip = async () => {
   &__nickname-input {
     :deep(.wd-input__inner) {
       padding: 24rpx 20rpx;
-      background: var(--color-bg-tertiary);
+      background: var(--color-fill-1);
       border: 1rpx solid var(--color-border-light);
       border-radius: 12rpx;
     }
@@ -365,7 +362,7 @@ const handleSkip = async () => {
     justify-content: center;
     width: 160rpx;
     height: 160rpx;
-    background: var(--color-bg-tertiary);
+    background: var(--color-fill-1);
     border: 2rpx dashed var(--color-border);
     border-radius: 50%;
   }
diff --git a/src/subPages/mine/profile/index.vue b/src/subPages/mine/profile/index.vue
index 1979daf..a500954 100644
--- a/src/subPages/mine/profile/index.vue
+++ b/src/subPages/mine/profile/index.vue
@@ -1,43 +1,37 @@
 <template>
   <view>
-    <view class="profile-content">
-      <view class="profile-content__card-area">
-        <wd-card v-if="userProfile">
-          <wd-cell-group border>
-            <wd-cell class="avatar-cell" title="头像" center is-link>
-              <view class="avatar-cell__avatar">
-                <view
-                  v-if="!userProfile.avatar"
-                  class="avatar-cell__img"
-                  @click="handleAvatarUpload"
-                >
-                  <wd-icon name="fill-camera" custom-class="avatar-cell__img-icon" />
-                </view>
-                <image
-                  v-if="userProfile.avatar"
-                  class="avatar-cell__img"
-                  :src="userProfile.avatar"
-                  mode="aspectFit"
-                  @click="handleAvatarUpload"
-                />
+    <view class="pt-20rpx">
+      <wd-card v-if="userProfile">
+        <wd-cell-group border>
+          <wd-cell title="头像" center is-link>
+            <view class="avatar-cell__avatar">
+              <view v-if="!userProfile.avatar" class="avatar-cell__img" @click="handleAvatarUpload">
+                <wd-icon name="camera-fill" custom-class="avatar-cell__img-icon" />
               </view>
-            </wd-cell>
-            <wd-cell title="昵称" :value="userProfile.nickname" is-link @click="openDialog()" />
-            <wd-cell
-              title="性别"
-              :value="userProfile.gender === 1 ? '男' : userProfile.gender === 2 ? '女' : '未知'"
-              is-link
-              @click="openDialog()"
-            />
-            <wd-cell title="用户名" :value="userProfile.username" />
-            <wd-cell title="部门" :value="userProfile.deptName" />
-            <wd-cell title="角色" :value="userProfile.roleNames" />
-            <view class="profile-last-cell-wrap">
-              <wd-cell title="创建日期" :value="userProfile.createTime" />
+              <image
+                v-if="userProfile.avatar"
+                class="avatar-cell__img"
+                :src="userProfile.avatar"
+                mode="aspectFit"
+                @click="handleAvatarUpload"
+              />
             </view>
-          </wd-cell-group>
-        </wd-card>
-      </view>
+          </wd-cell>
+          <wd-cell title="昵称" :value="userProfile.nickname" is-link @click="openDialog()" />
+          <wd-cell
+            title="性别"
+            :value="userProfile.gender === 1 ? '男' : userProfile.gender === 2 ? '女' : '未知'"
+            is-link
+            @click="openDialog()"
+          />
+          <wd-cell title="用户名" :value="userProfile.username" />
+          <wd-cell title="部门" :value="userProfile.deptName" />
+          <wd-cell title="角色" :value="userProfile.roleNames" />
+          <view class="profile-last-cell-wrap">
+            <wd-cell title="创建日期" :value="userProfile.createTime" />
+          </view>
+        </wd-cell-group>
+      </wd-card>
     </view>
 
     <!--头像裁剪-->
@@ -50,24 +44,29 @@
 
     <!--用户信息编辑弹出框-->
     <wd-popup v-if="dialogState.visible" v-model="dialogState.visible" position="bottom">
-      <wd-form ref="userProfileFormRef" :model="userProfileForm" custom-class="edit-form">
+      <wd-form
+        ref="userProfileFormRef"
+        :model="userProfileForm"
+        :schema="rules"
+        title-width="160rpx"
+        custom-class="pt-40rpx"
+      >
         <wd-cell-group border>
-          <wd-input
-            v-model="userProfileForm.nickname"
-            label="昵称"
-            label-width="160rpx"
-            placeholder="请输入昵称"
-            prop="nickname"
-            :rules="rules.nickname"
-          />
-          <wd-cell title="性别" title-width="160rpx" center prop="gender" :rules="rules.gender">
-            <wd-radio-group v-model="userProfileForm.gender" type="button" class="ef-radio-group">
+          <wd-form-item prop="nickname" title="昵称" required>
+            <wd-input v-model="userProfileForm.nickname" placeholder="请输入昵称" />
+          </wd-form-item>
+          <wd-form-item prop="gender" title="性别" required center>
+            <wd-radio-group
+              v-model="userProfileForm.gender"
+              type="button"
+              class="leading-none text-left"
+            >
               <wd-radio :value="1">男</wd-radio>
               <wd-radio :value="2">女</wd-radio>
             </wd-radio-group>
-          </wd-cell>
+          </wd-form-item>
         </wd-cell-group>
-        <view class="edit-form__submit">
+        <view class="p-24rpx">
           <wd-button size="large" block @click="handleSubmit">提交</wd-button>
         </view>
       </wd-form>
@@ -78,7 +77,13 @@
 import UserAPI, { type UserProfile, UserProfileForm } from "@/api/user";
 import FileAPI, { type FileInfo } from "@/api/file";
 import { checkLogin } from "@/utils/auth";
-import { getErrorMessage } from "@/utils";
+import { getErrorMessage } from "@/utils/error";
+import { toFormSchema } from "@/utils/form-schema";
+
+definePage({
+  name: "profile",
+  style: { navigationBarTitleText: "我的资料" },
+});
 
 const toast = useToast();
 const originalSrc = ref<string>(""); //选取的原图路径
@@ -126,7 +131,7 @@ function handleAvatarConfirm(event: ImgCropperConfirmEvent) {
 }
 
 // 本页面中所有的校验规则
-const rules = reactive({
+const rules = toFormSchema({
   nickname: [{ required: true, message: "请填写昵称" }],
   gender: [{ required: true, message: "请选择性别" }],
 });
@@ -192,47 +197,32 @@ function handleTouchMove(event: TouchEvent) {
 }
 </script>
 <style lang="scss" scoped>
-.avatar-cell {
-  :deep(.wd-cell__body) {
-    align-items: center;
-  }
+// 头像行内容较高，需显式居中
+:deep(.wd-cell__body) {
+  align-items: center;
 }
 
 .avatar-cell__avatar {
   display: flex;
   align-items: center;
-  justify-content: right;
+  // 小程序端不支持 justify-content: right
+  justify-content: flex-end;
+  width: 100%;
 }
 
 .avatar-cell__img {
   position: relative;
-  width: 160rpx;
-  height: 160rpx;
-  background-color: rgba(0, 0, 0, 0.04);
+  width: 112rpx;
+  height: 112rpx;
+  background-color: var(--color-fill-1);
   border-radius: 50%;
 }
 
-.profile-content__card-area {
-  padding-top: 20rpx;
-}
-
 .avatar-cell__img-icon {
   position: absolute;
   top: 50%;
   left: 50%;
   color: var(--color-text-inverse);
-}
-
-.edit-form {
-  padding-top: 40rpx;
-
-  &__submit {
-    padding: 24rpx;
-  }
-
-  .ef-radio-group {
-    line-height: 1;
-    text-align: left;
-  }
+  transform: translate(-50%, -50%);
 }
 </style>
diff --git a/src/subPages/mine/scan-confirm/index.vue b/src/subPages/mine/scan-confirm/index.vue
index 80a6c0e..2dd61b6 100644
--- a/src/subPages/mine/scan-confirm/index.vue
+++ b/src/subPages/mine/scan-confirm/index.vue
@@ -32,9 +32,8 @@
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
 import { useToast } from "@wot-ui/ui";
-import { useUserStore } from "@/store/modules/user";
-import { getErrorMessage } from "@/utils";
-import type { QrCodeScanResult } from "@/api/auth";
+import { getErrorMessage } from "@/utils/error";
+import AuthAPI, { type QrCodeScanResult } from "@/api/auth";
 
 definePage({
   name: "scan-confirm",
@@ -43,7 +42,6 @@ definePage({
 });
 
 const toast = useToast();
-const userStore = useUserStore();
 
 // toast 停留时长，读完提示再返回上一页
 const TOAST_DURATION = 800;
@@ -60,7 +58,7 @@ const scanResult = ref<QrCodeScanResult | null>(null);
 // 进入页面先标记已扫码，让 PC 端立即显示「已扫码」并展示头像/昵称
 const markScanned = async (code: string) => {
   try {
-    scanResult.value = await userStore.qrScan(code);
+    scanResult.value = await AuthAPI.markQrLoginScanned(code);
   } catch (error) {
     toast.error(getErrorMessage(error, "二维码无效或已过期"));
     setTimeout(() => uni.navigateBack(), TOAST_DURATION);
@@ -72,7 +70,7 @@ const handleConfirm = async () => {
   if (isLoading.value) return;
   isLoading.value = true;
   try {
-    await userStore.qrConfirm(ticket.value);
+    await AuthAPI.confirmQrLogin(ticket.value);
     toast.success("已确认登录");
     setTimeout(() => uni.navigateBack(), TOAST_DURATION);
   } catch (error) {
@@ -87,7 +85,7 @@ const handleCancel = async () => {
   if (isCancelling.value) return;
   isCancelling.value = true;
   try {
-    await userStore.qrCancel(ticket.value);
+    await AuthAPI.cancelQrLogin(ticket.value);
     toast.info("已取消登录");
   } catch {
     // 取消失败不影响返回
@@ -111,7 +109,7 @@ onLoad((options) => {
 <style lang="scss" scoped>
 .scan-confirm {
   min-height: 100vh;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
 
   &__body {
     display: flex;
@@ -126,10 +124,10 @@ onLoad((options) => {
     align-items: center;
     width: 100%;
     padding: 64rpx 48rpx;
-    background: var(--color-bg);
+    background: var(--color-bg-card);
     border: 2rpx solid var(--color-border-light);
     border-radius: 32rpx;
-    box-shadow: 0 20rpx 50rpx -10rpx rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-float);
   }
 
   &__logo {
diff --git a/src/subPages/mine/settings/agreement/index.vue b/src/subPages/mine/settings/agreement/index.vue
index 76812ba..185f337 100644
--- a/src/subPages/mine/settings/agreement/index.vue
+++ b/src/subPages/mine/settings/agreement/index.vue
@@ -7,13 +7,13 @@
         :title="section.title"
         :name="String(index)"
       >
-        <view class="agreement__content">
+        <view class="py-24rpx px-32rpx">
           <text class="agreement__text">{{ section.content }}</text>
         </view>
       </wd-collapse-item>
     </wd-collapse>
 
-    <view class="agreement__action">
+    <view class="px-32rpx mt-48rpx">
       <wd-button block @click="handleAgree">我已阅读并同意</wd-button>
     </view>
   </view>
@@ -71,18 +71,9 @@ const handleAgree = () => {
 </script>
 
 <style lang="scss" scoped>
-.agreement__content {
-  padding: 24rpx 32rpx;
-}
-
 .agreement__text {
   font-size: 28rpx;
   line-height: 1.6;
   color: var(--color-text-secondary);
 }
-
-.agreement__action {
-  padding: 0 32rpx;
-  margin-top: 48rpx;
-}
 </style>
diff --git a/src/subPages/mine/settings/index.vue b/src/subPages/mine/settings/index.vue
deleted file mode 100644
index d639324..0000000
--- a/src/subPages/mine/settings/index.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-  <view>
-    <view class="settings-group-wrap">
-      <wd-cell-group>
-        <wd-cell title="主题设置" icon="settings" is-link @click="navigateToTheme" />
-        <wd-cell title="用户协议" icon="user" is-link @click="navigateToUserAgreement" />
-        <wd-cell title="关于我们" icon="info-circle" is-link @click="navigateToAbout" />
-      </wd-cell-group>
-    </view>
-
-    <view class="settings-group-wrap">
-      <wd-cell-group custom-style="margin-top:24rpx">
-        <wd-cell title="网络测试" icon="wifi" is-link @click="navigateToNetworkTest" />
-        <wd-cell
-          title="清空缓存"
-          icon="delete"
-          :value="cacheSize"
-          clickable
-          @click="handleClearCache"
-        />
-      </wd-cell-group>
-    </view>
-
-    <view v-if="isLogin" class="logout-section">
-      <wd-button type="danger" block custom-class="logout-btn" @click="handleLogout">
-        退出登录
-      </wd-button>
-    </view>
-
-    <wd-loading
-      v-if="isClearing"
-      v-model="isClearing"
-      text="正在清理..."
-      mask
-      custom-class="loading-center"
-    />
-  </view>
-</template>
-
-<script lang="ts" setup>
-import { useUserStore } from "@/store";
-import { onLoad } from "@dcloudio/uni-app";
-import { useToast } from "@wot-ui/ui";
-
-definePage({
-  name: "settings",
-  style: { navigationBarTitleText: "设置" },
-});
-
-const userStore = useUserStore();
-const toast = useToast();
-const isLogin = computed(() => !!userStore.userInfo);
-
-// 主题设置
-const navigateToTheme = () => {
-  uni.navigateTo({
-    url: "/subPages/mine/settings/theme/index",
-  });
-};
-
-// 用户协议
-const navigateToUserAgreement = () => {
-  uni.navigateTo({
-    url: "/subPages/mine/settings/agreement/index",
-  });
-};
-
-// 关于我们
-const navigateToAbout = () => {
-  uni.navigateTo({
-    url: "/subPages/mine/about/index",
-  });
-};
-
-// 网络测试
-const navigateToNetworkTest = () => {
-  uni.navigateTo({ url: "/subPages/mine/settings/network/index" });
-};
-
-// 是否正在清理
-const isClearing = ref(false);
-// 缓存大小
-const cacheSize = ref<string>("计算中...");
-// 获取缓存大小
-const getCacheSize = async () => {
-  try {
-    // #ifdef MP-WEIXIN
-    const res = await uni.getStorageInfo();
-    cacheSize.value = formatSize(res.currentSize);
-    // #endif
-    // #ifdef H5
-    cacheSize.value = formatSize(
-      Object.keys(localStorage).reduce((size, key) => size + localStorage[key].length, 0)
-    );
-    // #endif
-    if (!cacheSize.value) {
-      cacheSize.value = "0B";
-    }
-  } catch {
-    cacheSize.value = "获取失败";
-  }
-};
-
-// 格式化存储大小
-const formatSize = (size: number) => {
-  if (size < 1024) {
-    return size + "B";
-  } else if (size < 1024 * 1024) {
-    return (size / 1024).toFixed(2) + "KB";
-  } else {
-    return (size / 1024 / 1024).toFixed(2) + "MB";
-  }
-};
-
-// 处理清除缓存
-const handleClearCache = async () => {
-  if (cacheSize.value === "获取失败") {
-    toast.info("获取缓存信息失败，请稍后重试");
-    return;
-  }
-  if (cacheSize.value === "0B") {
-    toast.info("暂无缓存需要清理");
-    return;
-  }
-  if (isClearing.value) {
-    return;
-  }
-
-  try {
-    isClearing.value = true;
-    // 模拟清理过程
-    await new Promise((resolve) => setTimeout(resolve, 1500));
-    // 清除缓存
-    await uni.clearStorage();
-    // 更新缓存大小显示
-    await getCacheSize();
-    // 提示清理成功
-    toast.success("清理成功");
-  } catch {
-    toast.error("清理失败");
-  } finally {
-    isClearing.value = false;
-  }
-};
-
-// 退出登录
-const handleLogout = () => {
-  uni.showModal({
-    title: "提示",
-    content: "确定要退出登录吗？",
-    confirmColor: "#ff4757",
-    success: (res) => {
-      if (res.confirm) {
-        userStore.logout();
-        toast.success("已退出登录");
-        setTimeout(() => {
-          uni.reLaunch({ url: "/pages/mine/index" });
-        }, 800);
-      }
-    },
-  });
-};
-
-// 检查登录状态
-onLoad(() => {
-  getCacheSize();
-});
-</script>
-
-<style lang="scss" scoped>
-.logout-section {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 48rpx;
-}
-
-.settings-group-wrap {
-  margin-bottom: 24rpx;
-}
-
-:deep(.wd-cell:active) {
-  background-color: var(--color-bg-tertiary) !important;
-}
-
-:deep(.logout-btn) {
-  height: 88rpx;
-  font-size: 32rpx;
-  font-weight: 500;
-  border-radius: 24rpx;
-}
-
-.loading-center {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  background-color: rgba(0, 0, 0, 0.6);
-  border-radius: 12rpx;
-}
-
-.loading-center :deep(.wd-loading__spinner) {
-  margin: 0 auto;
-}
-
-.loading-center :deep(.wd-loading__text) {
-  margin-top: 20rpx;
-  color: var(--color-text-inverse);
-  text-align: center;
-}
-</style>
diff --git a/src/subPages/mine/settings/network/index.vue b/src/subPages/mine/settings/network/index.vue
index 83f3cd6..2db3a7a 100644
--- a/src/subPages/mine/settings/network/index.vue
+++ b/src/subPages/mine/settings/network/index.vue
@@ -1,12 +1,12 @@
 <template>
   <view>
-    <view class="network__tip">
+    <view class="py-24rpx px-32rpx">
       <text class="network__tip-text">
         温馨提示：点击下方「开始测试」按钮，即可自动检测当前网络延迟。
       </text>
     </view>
 
-    <view class="network__action">
+    <view class="px-32rpx">
       <wd-button block plain @click="startTest">开始测试</wd-button>
     </view>
 
@@ -15,16 +15,16 @@
       <text class="network__loading-text">正在测试中...</text>
     </view>
 
-    <view v-if="result !== null" class="network__result">
+    <view v-if="result !== null" class="px-32rpx">
       <view class="result-card">
         <view class="result-card__header">测试结果</view>
         <view class="result-card__row">
           <text style="color: var(--color-text-secondary)">网络延迟</text>
-          <text :class="['network__delay', statusColor]">{{ result }}ms</text>
+          <text :class="['text-36rpx font-600', statusColor]">{{ result }}ms</text>
         </view>
         <view class="result-card__row">
           <text style="color: var(--color-text-secondary)">网络状态</text>
-          <text :class="['network__status', statusColor]">{{ statusText }}</text>
+          <text :class="['font-500', statusColor]">{{ statusText }}</text>
         </view>
       </view>
     </view>
@@ -36,7 +36,7 @@ import { onLoad } from "@dcloudio/uni-app";
 
 definePage({
   name: "network",
-  style: { navigationBarTitleText: "网络测试" },
+  style: { navigationBarTitleText: "网络检测" },
 });
 
 const result = ref<number | null>(null);
@@ -92,7 +92,7 @@ onLoad(() => {
 <style lang="scss" scoped>
 .result-card {
   overflow: hidden;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border: 1rpx solid var(--color-border);
   border-radius: 16rpx;
 
@@ -115,19 +115,11 @@ onLoad(() => {
   }
 }
 
-.network__tip {
-  padding: 24rpx 32rpx;
-}
-
 .network__tip-text {
   font-size: 24rpx;
   color: var(--color-text-placeholder);
 }
 
-.network__action {
-  padding: 0 32rpx;
-}
-
 .network__loading {
   display: flex;
   flex-direction: column;
@@ -140,33 +132,4 @@ onLoad(() => {
   font-size: 24rpx;
   color: var(--color-text-secondary);
 }
-
-.network__result {
-  padding: 0 32rpx;
-}
-
-.network__delay {
-  font-size: 36rpx;
-  font-weight: 600;
-}
-
-.network__status {
-  font-weight: 500;
-}
-
-.color-success {
-  color: var(--color-success);
-}
-
-.color-primary {
-  color: var(--color-primary);
-}
-
-.color-warning {
-  color: var(--color-warning);
-}
-
-.color-danger {
-  color: var(--color-danger);
-}
 </style>
diff --git a/src/subPages/mine/settings/privacy/index.vue b/src/subPages/mine/settings/privacy/index.vue
index 982a996..44fdc27 100644
--- a/src/subPages/mine/settings/privacy/index.vue
+++ b/src/subPages/mine/settings/privacy/index.vue
@@ -7,13 +7,13 @@
         :title="section.title"
         :name="String(index)"
       >
-        <view class="privacy__content">
+        <view class="py-24rpx px-32rpx">
           <text class="privacy__text">{{ section.content }}</text>
         </view>
       </wd-collapse-item>
     </wd-collapse>
 
-    <view class="privacy__action">
+    <view class="px-32rpx mt-48rpx">
       <wd-button block @click="handleAgree">我已阅读并同意</wd-button>
     </view>
   </view>
@@ -86,18 +86,9 @@ const handleAgree = () => {
 </script>
 
 <style lang="scss" scoped>
-.privacy__content {
-  padding: 24rpx 32rpx;
-}
-
 .privacy__text {
   font-size: 28rpx;
   line-height: 1.6;
   color: var(--color-text-secondary);
 }
-
-.privacy__action {
-  padding: 0 32rpx;
-  margin-top: 48rpx;
-}
 </style>
diff --git a/src/subPages/mine/settings/theme/index.vue b/src/subPages/mine/settings/theme/index.vue
index 58786f6..c3117ff 100644
--- a/src/subPages/mine/settings/theme/index.vue
+++ b/src/subPages/mine/settings/theme/index.vue
@@ -17,12 +17,12 @@
               v-for="(color, index) in themeColorOptions"
               :key="index"
               class="color-option"
-              :class="{ 'color-option--active': currentThemeColor === color.primary }"
+              :class="{ 'color-option--active': currentPrimaryColor === color.primary }"
               :style="{ backgroundColor: color.primary }"
               @click="handleSelectColor(color)"
             >
               <wd-icon
-                v-if="currentThemeColor === color.primary"
+                v-if="currentPrimaryColor === color.primary"
                 name="check"
                 size="14"
                 color="var(--color-text-inverse)"
@@ -36,8 +36,11 @@
       <wd-cell title="当前主题色">
         <template #default>
           <view class="flex items-center gap-12rpx">
-            <view class="color-dot" :style="{ backgroundColor: currentThemeColor }" />
-            <text class="text-24rpx color-text-secondary">{{ currentThemeColor }}</text>
+            <view
+              class="w-32rpx h-32rpx rounded-full"
+              :style="{ backgroundColor: currentPrimaryColor }"
+            />
+            <text class="text-24rpx color-text-secondary">{{ currentPrimaryColor }}</text>
           </view>
         </template>
       </wd-cell>
@@ -54,9 +57,9 @@
     <wd-cell-group title="效果预览" border custom-class="mt-24rpx">
       <wd-cell>
         <template #default>
-          <view class="flex items-center justify-center gap-24rpx py-12rpx">
+          <view class="flex w-full items-center justify-center gap-24rpx py-12rpx">
             <wd-button size="small">主要按钮</wd-button>
-            <text class="text-28rpx font-500" :style="{ color: currentThemeColor }">
+            <text class="text-28rpx font-500" :style="{ color: currentPrimaryColor }">
               主题色文本
             </text>
             <wd-tag type="primary" size="small" variant="filled">标签</wd-tag>
@@ -87,10 +90,13 @@
         <view class="p-4">
           <text class="text-28rpx color-text-secondary">请输入十六进制颜色值</text>
           <view class="flex items-center gap-16rpx mt-16rpx">
-            <view class="color-dot-lg" :style="{ backgroundColor: customColor || '#FF4757' }" />
+            <view
+              class="flex-shrink-0 w-48rpx h-48rpx rounded-8rpx"
+              :style="{ backgroundColor: customColor || currentPrimaryColor }"
+            />
             <wd-input
               v-model="customColor"
-              placeholder="例如: #FF4757"
+              placeholder="例如: #F53F3F"
               :maxlength="7"
               custom-class="theme-input"
             />
@@ -117,13 +123,8 @@ definePage({
 });
 
 // 使用主题组合函数
-const {
-  isDark,
-  themeColorOptions,
-  toggleTheme,
-  setThemeColor,
-  currentThemeColor: currentTheme,
-} = useTheme();
+const { isDark, themeColorOptions, toggleThemeMode, setThemeColor, selectedThemeColor } =
+  useTheme();
 
 const toast = useToast();
 const { confirm } = useDialog();
@@ -133,7 +134,7 @@ const customColor = ref("");
 const showCustomColorInput = ref(false);
 
 // 当前生效的主题色主色
-const currentThemeColor = computed(() => currentTheme.value.primary);
+const currentPrimaryColor = computed(() => selectedThemeColor.value.primary);
 
 // 选择预设颜色
 const handleSelectColor = (color: (typeof themeColorOptions)[0]) => {
@@ -145,7 +146,7 @@ const handleSelectColor = (color: (typeof themeColorOptions)[0]) => {
 // 显示自定义颜色输入
 const showCustomInput = () => {
   showCustomColorInput.value = true;
-  customColor.value = currentThemeColor.value;
+  customColor.value = currentPrimaryColor.value;
 };
 
 // 应用自定义颜色
@@ -182,13 +183,13 @@ const handleResetTheme = async () => {
 
 // 切换暗黑模式
 const handleToggleDarkMode = () => {
-  toggleTheme();
+  toggleThemeMode();
   toast.success(`已切换到${isDark.value ? "暗黑" : "浅色"}模式`);
 };
 
 // 页面显示时同步输入框回显（首次进入同样触发）
 onShow(() => {
-  customColor.value = currentThemeColor.value;
+  customColor.value = currentPrimaryColor.value;
 });
 </script>
 
@@ -208,19 +209,6 @@ onShow(() => {
   }
 }
 
-.color-dot {
-  width: 32rpx;
-  height: 32rpx;
-  border-radius: 50%;
-}
-
-.color-dot-lg {
-  flex-shrink: 0;
-  width: 48rpx;
-  height: 48rpx;
-  border-radius: 8rpx;
-}
-
 .popup-content {
   padding-bottom: env(safe-area-inset-bottom);
 }
@@ -246,8 +234,9 @@ onShow(() => {
   border-top: 1rpx solid var(--color-border);
 }
 
+// 自定义颜色输入框：跟随项目填充色与文字色（wot 默认 filled-oppo / text-main）
 :deep(.theme-input) {
-  color: var(--color-text) !important;
-  background-color: var(--color-bg-secondary) !important;
+  --wot-input-bg: var(--color-fill-1);
+  --wot-input-inner-color: var(--color-text);
 }
 </style>
diff --git a/src/subPages/work/components/custom-tree.vue b/src/subPages/work/components/custom-tree.vue
index 28c1479..ae02a29 100644
--- a/src/subPages/work/components/custom-tree.vue
+++ b/src/subPages/work/components/custom-tree.vue
@@ -331,7 +331,7 @@ watch(
 
 <style lang="scss" scoped>
 .custom-tree {
-  background: var(--color-bg);
+  background: var(--color-bg-card);
 }
 
 .custom-tree-node {
@@ -340,11 +340,11 @@ watch(
     align-items: center;
     min-height: 88rpx;
     padding-right: 24rpx;
-    background: var(--color-bg);
+    background: var(--color-bg-card);
     border-bottom: 2rpx solid var(--color-border-light);
 
     &:active {
-      background: var(--color-bg-secondary);
+      background: var(--color-fill-2);
     }
   }
 
diff --git a/src/subPages/work/config/index.vue b/src/subPages/work/config/index.vue
index 4520fa1..24c834c 100644
--- a/src/subPages/work/config/index.vue
+++ b/src/subPages/work/config/index.vue
@@ -10,12 +10,7 @@
     </view>
 
     <view class="mt-16rpx">
-      <wd-card
-        v-for="item in pageData"
-        :key="item.id"
-        custom-class="item-card"
-        @click="openConfigDialog(item.id)"
-      >
+      <wd-card v-for="item in configs" :key="item.id" @click="openConfigDialog(item.id)">
         <view class="flex-between">
           <text class="font-bold text-32rpx">{{ item.configName }}</text>
           <view
@@ -36,8 +31,8 @@
         </view>
       </wd-card>
 
-      <wd-loadmore v-if="total > 0" :state="loadMoreState" @reload="loadConfigList" />
-      <wd-empty v-else-if="total === 0" icon="search" tip="暂无数据" />
+      <wd-loadmore v-if="loadMoreState !== 'idle'" :state="loadMoreState" @reload="retry" />
+      <wd-empty v-else-if="total === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <!-- 弹窗表单 -->
@@ -85,8 +80,7 @@
     >
       <template #trigger>
         <view class="work-fab-trigger" @click="openConfigDialog()">
-          <wd-icon name="plus" size="16" color="var(--color-text-inverse)" />
-          <text>新增</text>
+          <wd-icon name="plus" size="20" color="var(--color-text-inverse)" />
         </view>
       </template>
     </wd-fab>
@@ -103,7 +97,7 @@
 
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
-import { toFormSchema } from "@/utils/form";
+import { toFormSchema } from "@/utils/form-schema";
 import { useToast } from "@wot-ui/ui";
 import { useActionSheet, type ActionMenuOption } from "@/composables/useActionSheet";
 import { usePagedList } from "@/composables/usePagedList";
@@ -125,7 +119,13 @@ const queryParams = reactive<ConfigPageQuery>({ pageNum: 1, pageSize: 10, keywor
 const dialog = reactive({ visible: false });
 
 // 分页加载（触底加载 + 下拉刷新统一由 usePagedList 维护）
-const { pageData, total, loadMoreState, reload } = usePagedList(ConfigAPI.getPage, queryParams);
+const {
+  items: configs,
+  total,
+  loadMoreState,
+  reload,
+  retry,
+} = usePagedList(ConfigAPI.getPage, queryParams);
 
 const initialFormData: ConfigForm = {
   id: undefined,
diff --git a/src/subPages/work/dept/index.vue b/src/subPages/work/dept/index.vue
index 7952617..e69ff0a 100644
--- a/src/subPages/work/dept/index.vue
+++ b/src/subPages/work/dept/index.vue
@@ -19,9 +19,9 @@
       >
         <!-- 自定义节点内容：ID + 名称 + 状态 -->
         <template #content="{ node }">
-          <view class="dept-node">
-            <text class="dept-node__id">{{ node.id }}</text>
-            <text class="dept-node__name">{{ node.name }}</text>
+          <view class="flex-1 flex-start gap-16rpx">
+            <text class="w-120rpx text-24rpx color-text-secondary">{{ node.id }}</text>
+            <text class="flex-1 truncate">{{ node.name }}</text>
             <wd-tag :type="node.status === 1 ? 'success' : 'danger'" size="small">
               {{ node.status === 1 ? "正常" : "禁用" }}
             </wd-tag>
@@ -29,7 +29,7 @@
         </template>
       </CustomTree>
 
-      <wd-empty v-if="deptList.length === 0" icon="search" tip="暂无数据" />
+      <wd-empty v-if="deptList.length === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <!-- 弹窗表单 -->
@@ -89,8 +89,7 @@
     >
       <template #trigger>
         <view class="work-fab-trigger" @click="openDeptDialog()">
-          <wd-icon name="plus" size="16" color="var(--color-text-inverse)" />
-          <text>新增</text>
+          <wd-icon name="plus" size="20" color="var(--color-text-inverse)" />
         </view>
       </template>
     </wd-fab>
@@ -107,7 +106,7 @@
 
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
-import { toFormSchema } from "@/utils/form";
+import { toFormSchema } from "@/utils/form-schema";
 import { findOptionChain } from "@/utils/tree";
 import { useToast } from "@wot-ui/ui";
 import type { CascaderOption } from "@wot-ui/ui/components/wd-cascader/types";
@@ -306,25 +305,3 @@ onLoad(() => {
 <script lang="ts">
 export default { options: { styleIsolation: "shared" } };
 </script>
-
-<style lang="scss" scoped>
-.dept-node {
-  display: flex;
-  flex: 1;
-  gap: 16rpx;
-  align-items: center;
-}
-
-.dept-node__id {
-  width: 120rpx;
-  font-size: 24rpx;
-  color: var(--color-text-secondary);
-}
-
-.dept-node__name {
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-</style>
diff --git a/src/subPages/work/dict/index.vue b/src/subPages/work/dict/index.vue
index 52fb907..03f3eeb 100644
--- a/src/subPages/work/dict/index.vue
+++ b/src/subPages/work/dict/index.vue
@@ -10,12 +10,7 @@
     </view>
 
     <view class="mt-16rpx">
-      <wd-card
-        v-for="item in pageData"
-        :key="item.id"
-        custom-class="item-card"
-        @click="openDictItemPage(item)"
-      >
+      <wd-card v-for="item in dicts" :key="item.id" @click="openDictItemPage(item)">
         <view class="flex-start">
           <view class="flex-1">
             <view class="flex-start">
@@ -40,8 +35,8 @@
         </view>
       </wd-card>
 
-      <wd-loadmore v-if="total > 0" :state="loadMoreState" @reload="loadDictTypeList" />
-      <wd-empty v-else-if="total === 0" icon="search" tip="暂无数据" />
+      <wd-loadmore v-if="loadMoreState !== 'idle'" :state="loadMoreState" @reload="retry" />
+      <wd-empty v-else-if="total === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <wd-popup
@@ -93,8 +88,7 @@
     >
       <template #trigger>
         <view class="work-fab-trigger" @click="openDictDialog()">
-          <wd-icon name="plus" size="16" color="var(--color-text-inverse)" />
-          <text>新增</text>
+          <wd-icon name="plus" size="20" color="var(--color-text-inverse)" />
         </view>
       </template>
     </wd-fab>
@@ -104,7 +98,7 @@
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
 import { useRouter } from "uni-mini-router";
-import { toFormSchema } from "@/utils/form";
+import { toFormSchema } from "@/utils/form-schema";
 import { useToast } from "@wot-ui/ui";
 import { useActionSheet, type ActionMenuOption } from "@/composables/useActionSheet";
 import { usePagedList } from "@/composables/usePagedList";
@@ -127,7 +121,13 @@ const queryParams = reactive<DictTypePageQuery>({ pageNum: 1, pageSize: 10, keyw
 const dialog = reactive({ visible: false });
 
 // 分页加载（触底加载 + 下拉刷新统一由 usePagedList 维护）
-const { pageData, total, loadMoreState, reload } = usePagedList(DictAPI.getPage, queryParams);
+const {
+  items: dicts,
+  total,
+  loadMoreState,
+  reload,
+  retry,
+} = usePagedList(DictAPI.getPage, queryParams);
 
 const initialFormData: DictTypeForm = {
   id: undefined,
diff --git a/src/subPages/work/dict/item/index.vue b/src/subPages/work/dict/item/index.vue
index 8fac425..deb8e2e 100644
--- a/src/subPages/work/dict/item/index.vue
+++ b/src/subPages/work/dict/item/index.vue
@@ -10,12 +10,7 @@
     </view>
 
     <view class="mt-16rpx">
-      <wd-card
-        v-for="item in pageData"
-        :key="item.id"
-        custom-class="item-card"
-        @click="openItemDialog(item.id)"
-      >
+      <wd-card v-for="item in dictItems" :key="item.id" @click="openItemDialog(item.id)">
         <view class="flex-start">
           <view class="flex-1">
             <view class="flex-start">
@@ -42,8 +37,8 @@
         </view>
       </wd-card>
 
-      <wd-loadmore v-if="total > 0" :state="loadMoreState" @reload="loadItemList" />
-      <wd-empty v-else-if="total === 0" icon="search" tip="暂无数据" />
+      <wd-loadmore v-if="loadMoreState !== 'idle'" :state="loadMoreState" @reload="retry" />
+      <wd-empty v-else-if="total === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <wd-popup
@@ -98,8 +93,7 @@
     >
       <template #trigger>
         <view class="work-fab-trigger" @click="openItemDialog()">
-          <wd-icon name="plus" size="16" color="var(--color-text-inverse)" />
-          <text>新增</text>
+          <wd-icon name="plus" size="20" color="var(--color-text-inverse)" />
         </view>
       </template>
     </wd-fab>
@@ -108,11 +102,11 @@
 
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
-import { toFormSchema } from "@/utils/form";
+import { toFormSchema } from "@/utils/form-schema";
 import { useToast } from "@wot-ui/ui";
 import { useActionSheet, type ActionMenuOption } from "@/composables/useActionSheet";
 import { usePagedList } from "@/composables/usePagedList";
-import DictAPI, { type DictItemForm, type DictItemPageQuery, type DictDataItem } from "@/api/dict";
+import DictAPI, { type DictItemForm, type DictItemPageQuery, type DictItem } from "@/api/dict";
 import { hasPermission } from "@/utils/permission";
 
 definePage({
@@ -137,7 +131,13 @@ const dialog = reactive({ visible: false });
  * 分页加载（触底加载 + 下拉刷新统一由 usePagedList 维护）
  * dictCode 尚未就绪（onLoad 取参前）时返回空页
  */
-const { pageData, total, loadMoreState, reload } = usePagedList(
+const {
+  items: dictItems,
+  total,
+  loadMoreState,
+  reload,
+  retry,
+} = usePagedList(
   (query: DictItemPageQuery) =>
     dictCode.value
       ? DictAPI.getItemPage(dictCode.value, query)
@@ -214,7 +214,7 @@ function closeItemDialog() {
   Object.assign(formData, initialFormData);
 }
 
-function showItemActions(item: DictDataItem) {
+function showItemActions(item: DictItem) {
   const menus: ActionMenuOption[] = [];
 
   if (hasPermission("sys:dict-item:update")) {
diff --git a/src/subPages/work/log/index.vue b/src/subPages/work/log/index.vue
index 8b3ebbe..0581a61 100644
--- a/src/subPages/work/log/index.vue
+++ b/src/subPages/work/log/index.vue
@@ -11,12 +11,7 @@
 
     <!-- 日志列表 -->
     <view class="mt-16rpx">
-      <wd-card
-        v-for="item in pageData"
-        :key="item.id"
-        custom-class="item-card"
-        @click="openLogDetail(item)"
-      >
+      <wd-card v-for="item in logs" :key="item.id" @click="openLogDetail(item)">
         <!-- 主信息行 -->
         <view class="flex-start">
           <view class="flex-1">
@@ -53,13 +48,13 @@
             hover-class="item-action--hover"
             @click.stop="openLogDetail(item)"
           >
-            <wd-icon name="view" size="16" class="color-text-secondary" />
+            <wd-icon name="eye" size="16" class="color-text-secondary" />
           </view>
         </view>
       </wd-card>
 
-      <wd-loadmore v-if="total > 0" :state="loadMoreState" @reload="loadLogList" />
-      <wd-empty v-else-if="total === 0" icon="search" tip="暂无数据" />
+      <wd-loadmore v-if="loadMoreState !== 'idle'" :state="loadMoreState" @reload="retry" />
+      <wd-empty v-else-if="total === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <!-- 详情弹窗 -->
@@ -113,7 +108,13 @@ definePage({
 const queryParams = reactive<LogPageQuery>({ pageNum: 1, pageSize: 10 });
 
 // 分页加载（触底加载 + 下拉刷新统一由 usePagedList 维护）
-const { pageData, total, loadMoreState, reload } = usePagedList(LogAPI.getPage, queryParams);
+const {
+  items: logs,
+  total,
+  loadMoreState,
+  reload,
+  retry,
+} = usePagedList(LogAPI.getPage, queryParams);
 
 const logDetail = ref<LogItem>({});
 const detailDialog = reactive({ visible: false });
diff --git a/src/subPages/work/menu/index.vue b/src/subPages/work/menu/index.vue
index 378a833..a56d672 100644
--- a/src/subPages/work/menu/index.vue
+++ b/src/subPages/work/menu/index.vue
@@ -19,7 +19,7 @@
       >
         <!-- 自定义节点内容：ID + 名称 + 状态 -->
         <template #content="{ node }">
-          <view class="menu-node">
+          <view class="flex-1 flex-start gap-16rpx">
             <text class="w-120rpx text-24rpx color-text-secondary">{{ node.id }}</text>
             <wd-icon v-if="node.icon" :name="node.icon" size="16" class="color-primary" />
             <text class="flex-1 truncate">{{ node.name }}</text>
@@ -37,7 +37,7 @@
         </template>
       </custom-tree>
 
-      <wd-empty v-if="menuList.length === 0" icon="search" tip="暂无数据" />
+      <wd-empty v-if="menuList.length === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <!-- 弹窗表单 -->
@@ -123,8 +123,7 @@
     >
       <template #trigger>
         <view class="work-fab-trigger" @click="openMenuDialog()">
-          <wd-icon name="plus" size="16" color="var(--color-text-inverse)" />
-          <text>新增</text>
+          <wd-icon name="plus" size="20" color="var(--color-text-inverse)" />
         </view>
       </template>
     </wd-fab>
@@ -141,7 +140,7 @@
 
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
-import { toFormSchema } from "@/utils/form";
+import { toFormSchema } from "@/utils/form-schema";
 import { findOptionChain } from "@/utils/tree";
 import { useToast } from "@wot-ui/ui";
 import { useActionSheet, type ActionMenuOption } from "@/composables/useActionSheet";
@@ -391,13 +390,3 @@ onLoad(() => {
 <script lang="ts">
 export default { options: { styleIsolation: "shared" } };
 </script>
-
-<style lang="scss" scoped>
-.menu-node {
-  display: flex;
-  flex: 1;
-  flex-wrap: nowrap;
-  gap: 16rpx;
-  align-items: center;
-}
-</style>
diff --git a/src/subPages/work/notice/index.vue b/src/subPages/work/notice/index.vue
index d83557e..760d49b 100644
--- a/src/subPages/work/notice/index.vue
+++ b/src/subPages/work/notice/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view>
     <view>
       <wd-search
@@ -11,12 +11,7 @@
 
     <!-- 通知列表 -->
     <view class="mt-16rpx">
-      <wd-card
-        v-for="item in pageData"
-        :key="item.id"
-        custom-class="item-card"
-        @click="openNoticeDetail(item)"
-      >
+      <wd-card v-for="item in notices" :key="item.id" @click="openNoticeDetail(item)">
         <!-- 主信息行 -->
         <view class="flex-start">
           <view class="notice-card__main">
@@ -41,7 +36,7 @@
             </text>
           </view>
           <view class="notice-card__detail">
-            <wd-icon name="warning" size="16" class="color-text-secondary" />
+            <wd-icon name="info-circle" size="16" class="color-text-secondary" />
             <text class="notice-card__detail-text">
               {{ getLevelText(item.level) }}
             </text>
@@ -61,8 +56,8 @@
         </view>
       </wd-card>
 
-      <wd-loadmore v-if="total > 0" :state="loadMoreState" @reload="loadNoticeList" />
-      <wd-empty v-else-if="total === 0" icon="search" tip="暂无数据" />
+      <wd-loadmore v-if="loadMoreState !== 'idle'" :state="loadMoreState" @reload="retry" />
+      <wd-empty v-else-if="total === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <!-- 详情弹窗 -->
@@ -86,7 +81,7 @@
           <wd-cell title="发布人" :value="noticeDetail.publisherName" />
           <wd-cell title="发布时间" :value="String(noticeDetail.publishTime || '-')" />
         </wd-cell-group>
-        <view class="mt-4 p-4 bg-[var(--color-bg-secondary)] rounded-lg">
+        <view class="mt-4 p-4 bg-[var(--color-fill-1)] rounded-lg">
           <rich-text :nodes="noticeDetail.content" class="text-28rpx" />
         </view>
         <view class="popup-actions">
@@ -152,8 +147,7 @@
     >
       <template #trigger>
         <view class="work-fab-trigger" @click="openNoticeDialog()">
-          <wd-icon name="plus" size="16" color="var(--color-text-inverse)" />
-          <text>新增</text>
+          <wd-icon name="plus" size="20" color="var(--color-text-inverse)" />
         </view>
       </template>
     </wd-fab>
@@ -162,7 +156,7 @@
 
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
-import { toFormSchema } from "@/utils/form";
+import { toFormSchema } from "@/utils/form-schema";
 import { useToast } from "@wot-ui/ui";
 import { useActionSheet, type ActionMenuOption } from "@/composables/useActionSheet";
 import { usePagedList } from "@/composables/usePagedList";
@@ -188,7 +182,13 @@ const isSubmitting = ref(false);
 const queryParams = reactive<NoticePageQuery>({ pageNum: 1, pageSize: 10 });
 
 // 分页加载（触底加载 + 下拉刷新统一由 usePagedList 维护）
-const { pageData, total, loadMoreState, reload } = usePagedList(NoticeAPI.getPage, queryParams);
+const {
+  items: notices,
+  total,
+  loadMoreState,
+  reload,
+  retry,
+} = usePagedList(NoticeAPI.getPage, queryParams);
 
 const noticeDetail = ref<NoticeDetail>({});
 const detailDialog = reactive({ visible: false });
diff --git a/src/subPages/work/role/assign-perm/index.vue b/src/subPages/work/role/assign-perm/index.vue
index 5ccd699..f232aa2 100644
--- a/src/subPages/work/role/assign-perm/index.vue
+++ b/src/subPages/work/role/assign-perm/index.vue
@@ -46,7 +46,7 @@
               />
               <wd-icon
                 v-else
-                name="click"
+                name="tag"
                 size="16"
                 :color="checked ? 'var(--color-primary)' : 'var(--color-text-secondary)'"
               />
@@ -66,7 +66,7 @@
         </template>
       </custom-tree>
 
-      <wd-empty v-if="menuTree.length === 0" icon="search" tip="暂无菜单数据" />
+      <wd-empty v-if="menuTree.length === 0" icon="search-line" tip="暂无菜单数据" />
     </scroll-view>
 
     <!-- 固定底部操作栏 -->
@@ -157,7 +157,7 @@ function handleCancel() {
 async function handleSubmit() {
   isSubmitting.value = true;
   try {
-    await RoleAPI.updateRoleMenus(roleId.value, checkedKeys.value.map(Number));
+    await RoleAPI.assignMenus(roleId.value, checkedKeys.value.map(Number));
     toast.success("保存成功");
     uni.navigateBack();
   } finally {
@@ -171,7 +171,7 @@ async function loadData() {
     // 并行加载菜单列表和角色已有权限
     const [menus, roleMenuIds, roleForm] = await Promise.all([
       MenuAPI.getList(),
-      RoleAPI.getRoleMenuIds(roleId.value),
+      RoleAPI.getMenuIds(roleId.value),
       RoleAPI.getFormData(roleId.value),
     ]);
     menuList.value = menus;
@@ -199,7 +199,7 @@ export default { options: { styleIsolation: "shared" } };
   display: flex;
   flex-direction: column;
   height: 100vh;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
 }
 
 .header {
@@ -208,7 +208,7 @@ export default { options: { styleIsolation: "shared" } };
   align-items: center;
   justify-content: space-between;
   padding: 12rpx 24rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   border-bottom: 2rpx solid var(--color-border-light);
 }
 
@@ -243,7 +243,7 @@ export default { options: { styleIsolation: "shared" } };
 .tree-container {
   flex: 1;
   height: 0; // 重要：让 flex + scroll-view 生效
-  background: var(--color-bg);
+  background: var(--color-bg-card);
 }
 
 .node-content {
@@ -282,7 +282,7 @@ export default { options: { styleIsolation: "shared" } };
   flex-shrink: 0;
   gap: 24rpx;
   padding: 24rpx;
-  background: var(--color-bg);
+  background: var(--color-bg-card);
   box-shadow: 0 -2rpx 16rpx rgba(0, 0, 0, 0.05);
 }
 
diff --git a/src/subPages/work/role/index.vue b/src/subPages/work/role/index.vue
index b7676e3..ccd8ea9 100644
--- a/src/subPages/work/role/index.vue
+++ b/src/subPages/work/role/index.vue
@@ -11,12 +11,7 @@
 
     <!-- 角色列表 -->
     <view class="mt-16rpx">
-      <wd-card
-        v-for="item in pageData"
-        :key="item.id"
-        custom-class="item-card"
-        @click="openRoleDialog(item.id)"
-      >
+      <wd-card v-for="item in roles" :key="item.id" @click="openRoleDialog(item.id)">
         <!-- 主信息行 -->
         <view class="flex-start">
           <view class="role-card__main">
@@ -33,7 +28,7 @@
         <!-- 辅助信息行 -->
         <view class="role-card__meta">
           <view class="role-card__detail">
-            <wd-icon name="view" size="16" class="color-text-secondary" />
+            <wd-icon name="eye" size="16" class="color-text-secondary" />
             <text class="role-card__detail-text">{{ item.dataScopeLabel }}</text>
           </view>
           <view class="role-card__detail">
@@ -55,8 +50,8 @@
         </view>
       </wd-card>
 
-      <wd-loadmore v-if="total > 0" :state="loadMoreState" @reload="loadRoleList" />
-      <wd-empty v-else-if="total === 0" icon="search" tip="暂无数据" />
+      <wd-loadmore v-if="loadMoreState !== 'idle'" :state="loadMoreState" @reload="retry" />
+      <wd-empty v-else-if="total === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <!-- 弹窗表单 -->
@@ -114,8 +109,7 @@
     >
       <template #trigger>
         <view class="work-fab-trigger" @click="openRoleDialog()">
-          <wd-icon name="plus" size="16" color="var(--color-text-inverse)" />
-          <text>新增</text>
+          <wd-icon name="plus" size="20" color="var(--color-text-inverse)" />
         </view>
       </template>
     </wd-fab>
@@ -132,7 +126,7 @@
 
 <script lang="ts" setup>
 import { onLoad } from "@dcloudio/uni-app";
-import { toFormSchema } from "@/utils/form";
+import { toFormSchema } from "@/utils/form-schema";
 import { useToast } from "@wot-ui/ui";
 import { useActionSheet, type ActionMenuOption } from "@/composables/useActionSheet";
 import { usePagedList } from "@/composables/usePagedList";
@@ -154,7 +148,13 @@ const queryParams = reactive<RolePageQuery>({ pageNum: 1, pageSize: 10, keywords
 const dialog = reactive({ visible: false });
 
 // 分页加载（触底加载 + 下拉刷新统一由 usePagedList 维护）
-const { pageData, total, loadMoreState, reload } = usePagedList(RoleAPI.getPage, queryParams);
+const {
+  items: roles,
+  total,
+  loadMoreState,
+  reload,
+  retry,
+} = usePagedList(RoleAPI.getPage, queryParams);
 
 const initialFormData: RoleForm = {
   id: undefined,
diff --git a/src/subPages/work/user/index.vue b/src/subPages/work/user/index.vue
index ed28776..499da3e 100644
--- a/src/subPages/work/user/index.vue
+++ b/src/subPages/work/user/index.vue
@@ -56,27 +56,22 @@
 
     <!-- 用户列表：筛选→列表 16rpx -->
     <view class="mt-16rpx">
-      <wd-card
-        v-for="item in pageData"
-        :key="item.id"
-        custom-class="item-card"
-        @click="openUserDialog(item)"
-      >
-        <!-- 主信息行 -->
-        <view class="flex-start">
+      <wd-card v-for="item in users" :key="item.id" @click="openUserDialog(item)">
+        <!-- 主信息行：头像 + 昵称/角色部门 + 状态 -->
+        <view class="user-card__header">
           <image class="user-card__avatar" :src="item.avatar" mode="aspectFill" lazy-load />
           <view class="user-card__main">
-            <view class="flex-start mt-12rpx">
+            <view class="user-card__name-row">
               <text class="user-card__name">{{ item.nickname }}</text>
               <wd-icon
                 v-if="item.gender === 1"
-                name="gender-male"
+                name="man"
                 color="var(--color-primary)"
                 class="ml-8rpx"
               />
               <wd-icon
                 v-else-if="item.gender === 2"
-                name="gender-female"
+                name="woman"
                 color="var(--color-danger)"
                 class="ml-8rpx"
               />
@@ -88,19 +83,19 @@
           </wd-tag>
         </view>
 
-        <!-- 辅助信息行 -->
-        <view class="user-card__meta">
+        <!-- 联系方式 -->
+        <view class="user-card__contacts">
           <view v-if="item.mobile" class="user-card__contact">
             <wd-icon name="mobile" size="16" class="color-text-secondary" />
             <text class="user-card__contact-text">{{ item.mobile }}</text>
           </view>
           <view v-if="item.email" class="user-card__contact">
-            <wd-icon name="mail" size="16" class="color-text-secondary" />
+            <wd-icon name="email" size="16" class="color-text-secondary" />
             <text class="user-card__contact-text">{{ item.email }}</text>
           </view>
         </view>
 
-        <!-- 元信息行 -->
+        <!-- 创建时间 + 更多操作 -->
         <view class="user-card__footer">
           <text class="item-time">{{ item.createTime }}</text>
           <view
@@ -113,8 +108,8 @@
         </view>
       </wd-card>
 
-      <wd-loadmore v-if="total > 0" :state="loadMoreState" @reload="loadUserList" />
-      <wd-empty v-else-if="total === 0" icon="search" tip="暂无数据" />
+      <wd-loadmore v-if="loadMoreState !== 'idle'" :state="loadMoreState" @reload="retry" />
+      <wd-empty v-else-if="total === 0" icon="search-line" tip="暂无数据" />
     </view>
 
     <!-- 弹窗表单 -->
@@ -185,7 +180,7 @@
         </wd-form>
         <view class="popup-actions">
           <wd-button type="info" variant="plain" @click="closeUserDialog">取消</wd-button>
-          <wd-button :loading="isSubmitting" @click="submitUserForm">保存</wd-button>
+          <wd-button :loading="isSubmitting" @click="handleUserSubmit">保存</wd-button>
         </view>
       </view>
     </wd-popup>
@@ -199,12 +194,11 @@
         !actionSheetVisible
       "
       :expandable="false"
-      :gap="{ bottom: 100 }"
+      :gap="{ bottom: 32 }"
     >
       <template #trigger>
         <view class="work-fab-trigger" @click="openUserDialog()">
-          <wd-icon name="plus" size="16" color="var(--color-text-inverse)" />
-          <text>新增</text>
+          <wd-icon name="plus" size="20" color="var(--color-text-inverse)" />
         </view>
       </template>
     </wd-fab>
@@ -221,7 +215,7 @@
     <wd-popup v-model="resetPwdDialog.visible" position="bottom" custom-class="popup-bottom">
       <view class="p-4">
         <view class="popup-title">重置密码</view>
-        <wd-form ref="resetPwdFormRef" :model="resetPwdForm">
+        <wd-form ref="resetPwdFormRef" :model="resetPwdForm" :schema="resetPwdRules">
           <wd-form-item prop="password" title="新密码" required>
             <wd-input v-model="resetPwdForm.password" placeholder="请输入新密码（至少6位）" />
           </wd-form-item>
@@ -243,7 +237,7 @@
 import { onLoad } from "@dcloudio/uni-app";
 import dayjs from "dayjs";
 import type { CascaderOption } from "@wot-ui/ui/components/wd-cascader/types";
-import { toFormSchema } from "@/utils/form";
+import { toFormSchema } from "@/utils/form-schema";
 import { findOptionChain } from "@/utils/tree";
 import { useQueue, useToast } from "@wot-ui/ui";
 import { useActionSheet, type ActionMenuOption } from "@/composables/useActionSheet";
@@ -356,7 +350,13 @@ const handleSortChange = ({ value }: { value: string | number }) => {
 const handleSearch = () => loadUserList();
 
 // 分页加载（触底加载 + 下拉刷新统一由 usePagedList 维护）
-const { pageData, total, loadMoreState, reload } = usePagedList(UserAPI.getPage, queryParams);
+const {
+  items: users,
+  total,
+  loadMoreState,
+  reload,
+  retry,
+} = usePagedList(UserAPI.getPage, queryParams);
 
 // 加载列表（回到第一页）
 function loadUserList() {
@@ -416,7 +416,7 @@ async function openUserDialog(user?: UserItem) {
 }
 
 // 提交表单
-function submitUserForm() {
+function handleUserSubmit() {
   formRef.value.validate().then(({ valid }: { valid: boolean }) => {
     if (!valid) return;
     isSubmitting.value = true;
@@ -519,6 +519,11 @@ export default { options: { styleIsolation: "shared" } };
 </script>
 
 <style lang="scss" scoped>
+.user-card__header {
+  display: flex;
+  align-items: center;
+}
+
 .user-card__avatar {
   flex-shrink: 0;
   width: 80rpx;
@@ -528,29 +533,46 @@ export default { options: { styleIsolation: "shared" } };
 
 .user-card__main {
   flex: 1;
+  min-width: 0;
   margin-left: 16rpx;
 }
 
+.user-card__name-row {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+}
+
 .user-card__name {
+  overflow: hidden;
   font-size: 32rpx;
   font-weight: 700;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .user-card__role {
+  display: block;
+  overflow: hidden;
   font-size: 24rpx;
   color: var(--color-text-secondary);
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.user-card__meta {
+// 手机号与邮箱：一行放不下自动换行，单个超长时省略号截断
+.user-card__contacts {
   display: flex;
-  gap: 24rpx;
-  margin-top: 12rpx;
+  flex-wrap: wrap;
+  gap: 8rpx 24rpx;
+  margin-top: 16rpx;
 }
 
 .user-card__contact {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
   min-width: 0;
+  max-width: 100%;
 }
 
 .user-card__contact-text {
@@ -566,6 +588,8 @@ export default { options: { styleIsolation: "shared" } };
   display: flex;
   align-items: center;
   justify-content: space-between;
+  padding-top: 8rpx;
   margin-top: 16rpx;
+  border-top: 1rpx solid var(--color-border-light);
 }
 </style>
diff --git a/src/theme.json b/src/theme.json
index df3bab5..b412f9f 100644
--- a/src/theme.json
+++ b/src/theme.json
@@ -9,7 +9,7 @@
     "tabBgColor": "#ffffff",
     "tabBorderStyle": "black",
     "tabColor": "#9ca3af",
-    "tabSelectedColor": "#4d80f0"
+    "tabSelectedColor": "#165dff"
   },
   "dark": {
     "bgColor": "#1f2937",
@@ -21,6 +21,6 @@
     "tabBgColor": "#111827",
     "tabBorderStyle": "white",
     "tabColor": "#9ca3af",
-    "tabSelectedColor": "#3b82f6"
+    "tabSelectedColor": "#165dff"
   }
 }
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index b4ff1f6..4b73cae 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,4 +1,4 @@
-// 全局类型声明文件
+// 全局类型声明文件
 // 自动引入 virtual 模块类型
 
 /// <reference types="@uni-helper/vite-plugin-uni-pages/client" />
@@ -52,7 +52,7 @@ declare global {
   /**
    * 响应数据
    */
-  interface ResponseData<T = any> {
+  interface ApiResponse<T = any> {
     code: string;
     data: T;
     msg: string;
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 16144d1..0ca1800 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,4 +1,4 @@
-import { Storage } from "./storage";
+import { Storage } from "./storage";
 import { ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY } from "@/constants";
 
 /**
@@ -9,10 +9,7 @@ import { ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY } from "@/constants";
  * 1. 检查登录状态并自动跳转：
  *    if (!checkLogin()) return; // 未登录会自动跳转到登录页
  *
- * 2. 静默检查登录状态：
- *    if (!isLoggedIn()) {
- *      // 处理未登录逻辑，不会自动跳转
- *    }
+ * 2. 静默检查登录状态统一走 user store 的 isAuthenticated
  */
 
 /**
@@ -74,11 +71,3 @@ export function checkLogin(silent: boolean = false): boolean {
 
   return false;
 }
-
-/**
- * 检查用户是否已登录（静默检查，不跳转）
- * @returns 返回用户是否已登录
- */
-export function isLoggedIn(): boolean {
-  return !!getAccessToken();
-}
diff --git a/src/utils/index.ts b/src/utils/error.ts
similarity index 99%
rename from src/utils/index.ts
rename to src/utils/error.ts
index b55e240..f26ecdb 100644
--- a/src/utils/index.ts
+++ b/src/utils/error.ts
@@ -1,4 +1,4 @@
-/**
+/**
  * 从 catch 捕获的 unknown 错误中提取提示文案
  * @param error catch 捕获的错误对象
  * @param fallback 无有效信息时的兜底文案
diff --git a/src/utils/form-schema.ts b/src/utils/form-schema.ts
new file mode 100644
index 0000000..1a37bdc
--- /dev/null
+++ b/src/utils/form-schema.ts
@@ -0,0 +1,80 @@
+import type { FormSchema } from "@wot-ui/ui/components/wd-form/types";
+
+/** 单条校验规则（v1 FormRules 风格） */
+export interface FormRule {
+  /** 是否必填 */
+  required?: boolean;
+  /** 校验失败提示文案 */
+  message?: string;
+  /** 正则校验（仅对字符串值生效） */
+  pattern?: RegExp;
+  /** 字符串长度下限（含） */
+  min?: number;
+  /** 字符串长度上限（含） */
+  max?: number;
+  /**
+   * 自定义校验：返回 true 表示通过；返回 false 按 message 提示；
+   * 返回字符串则以该文案提示
+   */
+  validator?: (value: any, model: Record<string, any>) => boolean | string;
+}
+
+/**
+ * v1 FormRules → v2 FormSchema 适配器
+ * 将旧版 rules 格式转换为 v2 的 schema 格式
+ */
+export function toFormSchema(rules: Record<string, FormRule[]>): FormSchema {
+  return {
+    validate(model: Record<string, any>) {
+      const issues: { path: Array<string | number>; message: string }[] = [];
+      for (const [field, fieldRules] of Object.entries(rules)) {
+        const value = model[field];
+        for (const rule of fieldRules) {
+          if (rule.required) {
+            const isEmpty =
+              value === undefined ||
+              value === null ||
+              (typeof value === "string" && value.trim() === "") ||
+              (Array.isArray(value) && value.length === 0);
+            if (isEmpty) {
+              issues.push({ path: [field], message: rule.message || `${field} 为必填项` });
+              break;
+            }
+          }
+          if (typeof value === "string") {
+            if (rule.min !== undefined && value.length < rule.min) {
+              issues.push({
+                path: [field],
+                message: rule.message || `${field} 长度不能少于 ${rule.min} 个字符`,
+              });
+              break;
+            }
+            if (rule.max !== undefined && value.length > rule.max) {
+              issues.push({
+                path: [field],
+                message: rule.message || `${field} 长度不能超过 ${rule.max} 个字符`,
+              });
+              break;
+            }
+            if (rule.pattern && !rule.pattern.test(value)) {
+              issues.push({ path: [field], message: rule.message || `${field} 格式不正确` });
+              break;
+            }
+          }
+          if (rule.validator) {
+            const result = rule.validator(value, model);
+            if (result === false || typeof result === "string") {
+              issues.push({
+                path: [field],
+                message:
+                  typeof result === "string" ? result : rule.message || `${field} 校验不通过`,
+              });
+              break;
+            }
+          }
+        }
+      }
+      return issues;
+    },
+  };
+}
diff --git a/src/utils/form.ts b/src/utils/form.ts
deleted file mode 100644
index dd182d4..0000000
--- a/src/utils/form.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { FormSchema } from "@wot-ui/ui/components/wd-form/types";
-
-/**
- * v1 FormRules → v2 FormSchema 适配器
- * 将旧版 rules 格式转换为 v2 的 schema 格式
- */
-export function toFormSchema(
-  rules: Record<string, { required?: boolean; message?: string; pattern?: RegExp }[]>
-): FormSchema {
-  return {
-    validate(model: Record<string, any>) {
-      const issues: { path: Array<string | number>; message: string }[] = [];
-      for (const [field, fieldRules] of Object.entries(rules)) {
-        const value = model[field];
-        for (const rule of fieldRules) {
-          if (rule.required) {
-            const isEmpty =
-              value === undefined ||
-              value === null ||
-              (typeof value === "string" && value.trim() === "") ||
-              (Array.isArray(value) && value.length === 0);
-            if (isEmpty) {
-              issues.push({ path: [field], message: rule.message || `${field} 为必填项` });
-              break;
-            }
-          }
-          if (rule.pattern && typeof value === "string" && !rule.pattern.test(value)) {
-            issues.push({ path: [field], message: rule.message || `${field} 格式不正确` });
-            break;
-          }
-        }
-      }
-      return issues;
-    },
-  };
-}
diff --git a/src/utils/permission.ts b/src/utils/permission.ts
index c4cf74b..ce74ad8 100644
--- a/src/utils/permission.ts
+++ b/src/utils/permission.ts
@@ -14,7 +14,7 @@ export function hasPermission(perm: string | string[]): boolean {
   if (!userInfo) return false;
 
   const { roles = [], perms = [] } = userInfo;
-  if (roles.includes(ROLE_ROOT) || keys.includes(PERM_ALL)) return true;
+  if (roles.includes(ROLE_ROOT) || perms.includes(PERM_ALL)) return true;
   if (perms.length === 0) return false;
 
   return keys.some((key) => perms.includes(key));
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 695e3f6..cb1f93d 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -6,6 +6,17 @@ import { ApiCode } from "@/enums/api-code-enum";
 // 401 跳转防抖锁，避免并发请求多次跳转登录页
 let isRedirecting401 = false;
 
+// 会话失效回调：由启动阶段注册（main.ts），401 时同步清理内存中的登录态
+// request 层不直接依赖 store，避免 request → store → api → request 循环引用
+let unauthorizedHandler: (() => void) | null = null;
+
+/**
+ * 注册会话失效回调（内存 token、userInfo 等由回调所属方统一清理）
+ */
+export function setUnauthorizedHandler(handler: () => void): void {
+  unauthorizedHandler = handler;
+}
+
 /**
  * 请求错误类
  */
@@ -75,8 +86,7 @@ function request<TResponse = any, TData = unknown>(
       success: (res: UniApp.RequestSuccessCallbackResult) => {
         // 后端统一响应体：只取业务层字段
         const body = res?.data as
-          | { code?: string; msg?: string; message?: string; data?: unknown }
-          | undefined;
+          { code?: string; msg?: string; message?: string; data?: unknown } | undefined;
         const serverCode = body?.code;
         const serverMsg = body?.msg || body?.message;
 
@@ -88,8 +98,14 @@ function request<TResponse = any, TData = unknown>(
               serverCode === ApiCode.REFRESH_TOKEN_INVALID)) ||
           res.statusCode === 401;
         if (isTokenError) {
-          clearTokens();
-          Storage.remove(USER_INFO_KEY);
+          // 会话重置集中处理：已注册回调时由 store 统一清理内存与持久化；
+          // 未注册时兜底清理持久化令牌
+          if (unauthorizedHandler) {
+            unauthorizedHandler();
+          } else {
+            clearTokens();
+            Storage.remove(USER_INFO_KEY);
+          }
           if (!isRedirecting401) {
             isRedirecting401 = true;
             uni.navigateTo({
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index 43ab03e..2572539 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -3,6 +3,16 @@
  * 提供uni-app Storage操作方法
  */
 
+import {
+  ACCESS_TOKEN_KEY,
+  REFRESH_TOKEN_KEY,
+  THEME_MODE_KEY,
+  THEME_COLOR_KEY,
+} from "@/constants";
+
+/** 清理缓存时保留的键：登录态与主题偏好（清掉会导致下次启动退出登录、设置被重置） */
+const PRESERVED_KEYS = [ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY, THEME_MODE_KEY, THEME_COLOR_KEY];
+
 /**
  * localStorage 存储
  */
@@ -26,8 +36,54 @@ function remove(key: string): void {
   uni.removeStorageSync(key);
 }
 
+/** 估算字符串 UTF-8 字节数（小程序没有 Blob，不能靠它算长度） */
+function byteLength(value: string): number {
+  let bytes = 0;
+  for (let i = 0; i < value.length; i += 1) {
+    const code = value.charCodeAt(i);
+    bytes += code < 0x80 ? 1 : code < 0x800 ? 2 : 3;
+  }
+  return bytes;
+}
+
+/** 可清理缓存的字节数：只统计登录态与主题偏好之外的键 */
+function getClearableBytes(): number {
+  const { keys } = uni.getStorageInfoSync();
+  return keys.reduce((total, key) => {
+    if (PRESERVED_KEYS.includes(key)) {
+      return total;
+    }
+    const value = uni.getStorageSync(key);
+    if (value === null || value === undefined || value === "") {
+      return total;
+    }
+    const text = typeof value === "string" ? value : JSON.stringify(value) || "";
+    return total + byteLength(text);
+  }, 0);
+}
+
+/**
+ * 清理业务缓存：保留登录态与主题偏好
+ * 不能用 uni.clearStorage()，它会连 token 和主题一起清掉
+ * @returns 清除的键数量
+ */
+function clearCache(): number {
+  const { keys } = uni.getStorageInfoSync();
+  let removed = 0;
+  keys.forEach((key) => {
+    if (PRESERVED_KEYS.includes(key)) {
+      return;
+    }
+    uni.removeStorageSync(key);
+    removed += 1;
+  });
+  return removed;
+}
+
 export const Storage = {
   set,
   get,
   remove,
+  getClearableBytes,
+  clearCache,
 };
diff --git a/unocss.config.ts b/unocss.config.ts
index a35c6f1..ff74f9d 100644
--- a/unocss.config.ts
+++ b/unocss.config.ts
@@ -10,6 +10,7 @@ export default {
     // attributify autocomplete
     presetWeappAttributify(),
   ],
+  // 只保留实际复用的组合；语义色直接用 color-* 类，其余交给 presetWeapp 自带规则
   shortcuts: [
     {
       "flex-center": "flex justify-center items-center",
@@ -17,22 +18,7 @@ export default {
       "flex-start": "flex justify-start items-center",
       "flex-end": "flex justify-end items-center",
       "flex-between": "flex justify-between items-center",
-      "flex-around": "flex justify-around items-center",
-      "flex-evenly": "flex justify-evenly items-center",
-      "flex-stretch": "flex justify-stretch items-center",
-      "flex-baseline": "flex justify-baseline items-center",
-      "flex-column": "flex flex-col",
-      "flex-row": "flex flex-row",
 
-      "flex-col-center": "flex flex-col items-center",
-
-      "text-secondary": "color-text-secondary",
-      "text-placeholder": "color-text-placeholder",
-      "text-inverse": "color-text-inverse",
-      "text-xs": "text-24rpx",
-      "text-sm": "text-28rpx",
-      "text-base": "text-32rpx",
-      "text-lg": "text-36rpx",
       "font-bold": "font-semibold",
     },
   ],