From 4dd142bb5a8a264beaa90c02232b9d03796710d0 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Thu, 23 Jul 2026 23:13:21 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=20wot-ui=20?= =?UTF-8?q?=E8=87=B3=202.2.0=20=E5=B9=B6=E9=80=82=E9=85=8D=E6=9A=97?= =?UTF-8?q?=E9=BB=91=E6=A8=A1=E5=BC=8F=E4=B8=BB=E9=A2=98=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ConfigProvider 全局配置 button 默认类型、tag 默认变体 - 清理模板中重复的 type=primary 和 variant=plain - 静态资源 logo.png 迁至 src/static/images/ - 暗黑模式 --wot-filled-oppo 统一组件背景色 --- components.d.ts | 6 ++++++ package.json | 2 +- src/layouts/default.vue | 2 ++ src/layouts/tabbar.vue | 2 +- src/pages/login/index.vue | 6 +++--- src/pages/mine/about/index.vue | 4 ++-- src/pages/mine/account/index.vue | 8 +++++--- src/pages/mine/index.vue | 4 ++-- src/pages/mine/profile/complete-profile.vue | 1 - src/pages/mine/profile/index.vue | 2 +- src/pages/mine/settings/agreement/index.vue | 2 +- src/pages/mine/settings/privacy/index.vue | 2 +- src/pages/mine/settings/theme/index.vue | 8 ++++---- src/pages/qr-code-confirm/index.vue | 4 ++-- src/pages/work/config/index.vue | 2 +- src/pages/work/dept/index.vue | 2 +- src/pages/work/dict/index.vue | 4 ++-- src/pages/work/dict/item/index.vue | 4 ++-- src/pages/work/menu/index.vue | 2 +- src/pages/work/notice/index.vue | 4 ++-- src/pages/work/role/assign-perm.vue | 6 +++--- src/pages/work/role/index.vue | 4 ++-- src/pages/work/user/index.vue | 7 +++---- src/static/images/logo.png | Bin 0 -> 19649 bytes src/styles/theme.scss | 4 ++++ 25 files changed, 52 insertions(+), 40 deletions(-) create mode 100644 src/static/images/logo.png diff --git a/components.d.ts b/components.d.ts index 3e67f27..59ed0a0 100644 --- a/components.d.ts +++ b/components.d.ts @@ -19,11 +19,14 @@ declare module 'vue' { QiunError: typeof import('./src/components/qiun-error/qiun-error.vue')['default'] QiunLoading: typeof import('./src/components/qiun-loading/qiun-loading.vue')['default'] WdActionSheet: typeof import('@wot-ui/ui/components/wd-action-sheet/wd-action-sheet.vue')['default'] + WdBadge: typeof import('@wot-ui/ui/components/wd-badge/wd-badge.vue')['default'] WdButton: typeof import('@wot-ui/ui/components/wd-button/wd-button.vue')['default'] + WdCalendar: typeof import('@wot-ui/ui/components/wd-calendar/wd-calendar.vue')['default'] WdCard: typeof import('@wot-ui/ui/components/wd-card/wd-card.vue')['default'] WdCascader: typeof import('@wot-ui/ui/components/wd-cascader/wd-cascader.vue')['default'] WdCell: typeof import('@wot-ui/ui/components/wd-cell/wd-cell.vue')['default'] WdCellGroup: typeof import('@wot-ui/ui/components/wd-cell-group/wd-cell-group.vue')['default'] + WdCheckbox: typeof import('@wot-ui/ui/components/wd-checkbox/wd-checkbox.vue')['default'] WdCollapse: typeof import('@wot-ui/ui/components/wd-collapse/wd-collapse.vue')['default'] WdCollapseItem: typeof import('@wot-ui/ui/components/wd-collapse-item/wd-collapse-item.vue')['default'] WdConfigProvider: typeof import('@wot-ui/ui/components/wd-config-provider/wd-config-provider.vue')['default'] @@ -35,6 +38,8 @@ declare module 'vue' { WdFab: typeof import('@wot-ui/ui/components/wd-fab/wd-fab.vue')['default'] WdForm: typeof import('@wot-ui/ui/components/wd-form/wd-form.vue')['default'] WdFormItem: typeof import('@wot-ui/ui/components/wd-form-item/wd-form-item.vue')['default'] + WdGrid: typeof import('@wot-ui/ui/components/wd-grid/wd-grid.vue')['default'] + WdGridItem: typeof import('@wot-ui/ui/components/wd-grid-item/wd-grid-item.vue')['default'] WdIcon: typeof import('@wot-ui/ui/components/wd-icon/wd-icon.vue')['default'] WdImgCropper: typeof import('@wot-ui/ui/components/wd-img-cropper/wd-img-cropper.vue')['default'] WdInput: typeof import('@wot-ui/ui/components/wd-input/wd-input.vue')['default'] @@ -47,6 +52,7 @@ declare module 'vue' { WdRadioGroup: typeof import('@wot-ui/ui/components/wd-radio-group/wd-radio-group.vue')['default'] WdSearch: typeof import('@wot-ui/ui/components/wd-search/wd-search.vue')['default'] WdSelectPicker: typeof import('@wot-ui/ui/components/wd-select-picker/wd-select-picker.vue')['default'] + WdSwiper: typeof import('@wot-ui/ui/components/wd-swiper/wd-swiper.vue')['default'] WdSwitch: typeof import('@wot-ui/ui/components/wd-switch/wd-switch.vue')['default'] WdTabbar: typeof import('@wot-ui/ui/components/wd-tabbar/wd-tabbar.vue')['default'] WdTabbarItem: typeof import('@wot-ui/ui/components/wd-tabbar-item/wd-tabbar-item.vue')['default'] diff --git a/package.json b/package.json index ff8051d..d2df9c5 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@dcloudio/uni-quickapp-webview": "3.0.0-4020420240722002", "@uni-helper/uni-use": "^0.19.15", "@vueuse/core": "9.13.0", - "@wot-ui/ui": "2.0.8", + "@wot-ui/ui": "^2.2.0", "dayjs": "^1.11.13", "pinia": "^2.3.1", "vue": "^3.5.22", diff --git a/src/layouts/default.vue b/src/layouts/default.vue index 60ee56a..4f3f275 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -21,6 +21,8 @@ export default { :theme-vars="themeVars" :custom-class="theme === 'dark' ? 'dark' : ''" :theme="theme === 'dark' ? 'dark' : ''" + :button="{ type: 'primary' }" + :tag="{ variant: 'plain' }" > diff --git a/src/layouts/tabbar.vue b/src/layouts/tabbar.vue index 56bb1b3..7bab790 100644 --- a/src/layouts/tabbar.vue +++ b/src/layouts/tabbar.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/work/role/index.vue b/src/pages/work/role/index.vue index 14841bc..3a69ad4 100644 --- a/src/pages/work/role/index.vue +++ b/src/pages/work/role/index.vue @@ -25,7 +25,7 @@ {{ item.code }} - + {{ item.status === 1 ? "正常" : "禁用" }} @@ -102,7 +102,7 @@ 取消 - 保存 + 保存 diff --git a/src/pages/work/user/index.vue b/src/pages/work/user/index.vue index 9e24bce..05579bf 100644 --- a/src/pages/work/user/index.vue +++ b/src/pages/work/user/index.vue @@ -34,7 +34,7 @@ 重置 - 查询 + 查询 @@ -71,7 +71,7 @@ {{ item.roleNames }} · {{ item.deptName }} - + {{ item.status === 1 ? "正常" : "禁用" }} @@ -174,7 +174,7 @@ 取消 - 保存 + 保存 @@ -204,7 +204,6 @@ 取消 diff --git a/src/static/images/logo.png b/src/static/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ebfa2af601352e49bd6d93797b43f5b4f4d3bf5d GIT binary patch literal 19649 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