From b81334e3d1bd02d15c37293f85c07fa67ce2b5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Tue, 7 Jan 2025 17:12:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E9=A6=96?= =?UTF-8?q?=E9=A1=B5UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/{TeamDilog => TeamPopup}/TeamPopup.vue | 1 - src/pages/home/home.vue | 4 ++-- src/typings.ts | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename src/components/{TeamDilog => TeamPopup}/TeamPopup.vue (99%) diff --git a/src/components/TeamDilog/TeamPopup.vue b/src/components/TeamPopup/TeamPopup.vue similarity index 99% rename from src/components/TeamDilog/TeamPopup.vue rename to src/components/TeamPopup/TeamPopup.vue index d988f1f..b9e73f1 100644 --- a/src/components/TeamDilog/TeamPopup.vue +++ b/src/components/TeamPopup/TeamPopup.vue @@ -64,7 +64,6 @@ onMounted(async () => { systemInfo.value = await $basic.getSystemInfo() - showModal() }) const closePopup = () => { diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue index 0107281..d41fda6 100644 --- a/src/pages/home/home.vue +++ b/src/pages/home/home.vue @@ -31,7 +31,7 @@ Date: Tue, 7 Jan 2025 17:12:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E9=A6=96?= =?UTF-8?q?=E9=A1=B5UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/{TeamDilog => TeamPopup}/TeamPopup.vue | 1 - src/pages/home/home.vue | 4 ++-- src/typings.ts | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename src/components/{TeamDilog => TeamPopup}/TeamPopup.vue (99%) diff --git a/src/components/TeamDilog/TeamPopup.vue b/src/components/TeamPopup/TeamPopup.vue similarity index 99% rename from src/components/TeamDilog/TeamPopup.vue rename to src/components/TeamPopup/TeamPopup.vue index d988f1f..b9e73f1 100644 --- a/src/components/TeamDilog/TeamPopup.vue +++ b/src/components/TeamPopup/TeamPopup.vue @@ -64,7 +64,6 @@ onMounted(async () => { systemInfo.value = await $basic.getSystemInfo() - showModal() }) const closePopup = () => { diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue index 0107281..d41fda6 100644 --- a/src/pages/home/home.vue +++ b/src/pages/home/home.vue @@ -31,7 +31,7 @@ Date: Fri, 10 Jan 2025 11:08:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9wotui=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 10 +-- src/pages.json | 108 ++++++++++++++++++++++++++++++++ src/pages/approval/approval.vue | 5 ++ src/pages/home/home.vue | 27 +------- src/types/uni-pages.d.ts | 13 +++- 6 files changed, 134 insertions(+), 31 deletions(-) create mode 100644 src/pages/approval/approval.vue diff --git a/package.json b/package.json index 3ecefa2..2ad7a4b 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "pinia-plugin-persistedstate": "3.2.1", "qs": "6.5.3", "vue": "3.4.21", - "wot-design-uni": "1.4.0", + "wot-design-uni": "1.5.1", "z-paging": "^2.8.4" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d31508e..7f6fb04 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,8 +72,8 @@ importers: specifier: 3.4.21 version: 3.4.21(typescript@5.7.2) wot-design-uni: - specifier: 1.4.0 - version: 1.4.0(vue@3.4.21(typescript@5.7.2)) + specifier: 1.5.1 + version: 1.5.1(vue@3.4.21(typescript@5.7.2)) z-paging: specifier: ^2.8.4 version: 2.8.4 @@ -5462,8 +5462,8 @@ packages: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} - wot-design-uni@1.4.0: - resolution: {integrity: sha512-h6sjrgfg7mP0nJwGTiHn/iTLPFyRswMpQV6MKhWN3skTnXe+FAyndvtXofpXp+uLkTXefGfw5BPI0uuCMD874w==} + wot-design-uni@1.5.1: + resolution: {integrity: sha512-jiDRuF8r7+xAldc4Dp+2T1VnqDnOoMWsXu6aRpDg2QG7ZH+/bJl7W8H8hHbKFgA9lu1By/HCDmpG7JC45nYtBw==} engines: {HBuilderX: ^3.8.7} peerDependencies: vue: '>=3.2.47' @@ -12246,7 +12246,7 @@ snapshots: word-wrap@1.2.5: {} - wot-design-uni@1.4.0(vue@3.4.21(typescript@5.7.2)): + wot-design-uni@1.5.1(vue@3.4.21(typescript@5.7.2)): dependencies: vue: 3.4.21(typescript@5.7.2) diff --git a/src/pages.json b/src/pages.json index 400228e..34d06b9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -63,6 +63,74 @@ "path": "pages/application-list/application-list", "type": "page" }, + { + "path": "pages/approval/approval", + "type": "page" + }, + { + "path": "pages/attendance/allowed-time", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/attendance-rules", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/attendance", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/classes-add-edit", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/classes-manage", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/flexible-punching", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/issue-record-detail", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/issue-record", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/code/code", "type": "page", @@ -110,6 +178,46 @@ { "path": "pages/workbench/workbench", "type": "page" + }, + { + "path": "pages/attendance/attendance-add-group/attendance-add-group", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/attendance-add-group/attendance-staff", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/attendance-add-group/attendance-time", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/attendance-add-group/outside-rules", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/attendance/attendance-add-group/special-date-set", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } } ], "subPackages": [] diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue new file mode 100644 index 0000000..8122070 --- /dev/null +++ b/src/pages/approval/approval.vue @@ -0,0 +1,5 @@ + + + diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue index d41fda6..ac82db0 100644 --- a/src/pages/home/home.vue +++ b/src/pages/home/home.vue @@ -59,7 +59,7 @@ import CustomTab from '@/pages/home/HomeTab.vue' import { useBasicStore, useUserStore } from '@/store' import { Result } from '@/constants/result' - import { HomeTab, TabBarItem } from '@/typings' + import { HomeTab } from '@/typings' import HomeSwiper from '@/pages/home/HomeSwiper.vue' import HomeBulletin from '@/pages/home/HomeBulletin.vue' import HomeTodo from '@/pages/home/HomeTodo.vue' @@ -80,29 +80,6 @@ const teamPopup = ref(null) - const list = ref>([ - { - title: '首页', - isDot: true, - icon: 'home' - }, - { - title: '我的', - value: 0, - icon: '/static/tabbar/home.png' - }, - { - title: '最大值', - value: 200, - icon: '/static/tabbar/home.png' - }, - { - title: '客服', - value: 3, - icon: '/static/tabbar/home.png' - } - ]) - const featuresList = ref>([ { name: '视频', @@ -235,11 +212,13 @@ { id: 386, icon: 'https://file.hikmall.com/prod/image/c5a56acf8efe47d78fc0107552c98bf8.png', + url: '/pages/approval/approval', name: '发起审批' }, { id: 385, icon: 'https://file.hikmall.com/prod/image/6b946ba258234cdc8d447631b07939c3.png', + url: '/pages/approval/approval', name: '审批记录' } ] diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 29e297b..3a084ea 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -6,7 +6,15 @@ interface NavigateToOptions { url: "/pages/home/home" | "/pages/application-list/application-list" | + "/pages/approval/approval" | + "/pages/attendance/allowed-time" | + "/pages/attendance/attendance-rules" | "/pages/attendance/attendance" | + "/pages/attendance/classes-add-edit" | + "/pages/attendance/classes-manage" | + "/pages/attendance/flexible-punching" | + "/pages/attendance/issue-record-detail" | + "/pages/attendance/issue-record" | "/pages/code/code" | "/pages/get-code/get-code" | "/pages/login/login" | @@ -15,7 +23,10 @@ interface NavigateToOptions { "/pages/reset-password/reset-password" | "/pages/workbench/workbench" | "/pages/attendance/attendance-add-group/attendance-add-group" | - "/pages/attendance/attendance-add-group/outside-rules"; + "/pages/attendance/attendance-add-group/attendance-staff" | + "/pages/attendance/attendance-add-group/attendance-time" | + "/pages/attendance/attendance-add-group/outside-rules" | + "/pages/attendance/attendance-add-group/special-date-set"; } interface RedirectToOptions extends NavigateToOptions {} From 9e206f362ae9239d9a10e1ba065df3a00516c9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Fri, 10 Jan 2025 15:50:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E5=88=9B=E5=BB=BA=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 6 ++++- src/pages/approval/approval.vue | 40 +++++++++++++++++++++++++++++++-- src/pages/home/home.vue | 4 ++-- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/src/pages.json b/src/pages.json index 34d06b9..f5ace73 100644 --- a/src/pages.json +++ b/src/pages.json @@ -65,7 +65,11 @@ }, { "path": "pages/approval/approval", - "type": "page" + "type": "page", + "style": { + "navigationStyle": "custom", + "disableScroll": true + } }, { "path": "pages/attendance/allowed-time", diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue index 8122070..5c80404 100644 --- a/src/pages/approval/approval.vue +++ b/src/pages/approval/approval.vue @@ -1,5 +1,41 @@ + +{ + style: { + navigationStyle: 'custom', + disableScroll: true + } +} + - + diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue index ac82db0..092cbb0 100644 --- a/src/pages/home/home.vue +++ b/src/pages/home/home.vue @@ -212,13 +212,13 @@ { id: 386, icon: 'https://file.hikmall.com/prod/image/c5a56acf8efe47d78fc0107552c98bf8.png', - url: '/pages/approval/approval', + url: '/pages/approval/approval?index=0', name: '发起审批' }, { id: 385, icon: 'https://file.hikmall.com/prod/image/6b946ba258234cdc8d447631b07939c3.png', - url: '/pages/approval/approval', + url: '/pages/approval/approval?index=1', name: '审批记录' } ]