diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue index e1755e0..7e6a7f9 100644 --- a/src/components/TopNavigation/TopNavigation.vue +++ b/src/components/TopNavigation/TopNavigation.vue @@ -26,14 +26,21 @@ class="pos-absolute left-3 h-5 w-5" @click="back" > - - + + {{ title }} + + {{ rightButtonText }} + @@ -62,16 +69,24 @@ backUrl: { type: String, default: '/static/images/icon_back.png' + }, + rightButtonText: { + type: [String, null], + default: null } }) - const emits = defineEmits(['back']) + const emits = defineEmits(['back', 'rightButton']) const back = () => { uni.navigateBack() emits('back') } + const rightButton = () => { + emits('rightButton') + } + onMounted(async () => { systemInfo.value = await $basic.getSystemInfo() }) diff --git a/src/pages.json b/src/pages.json index 1fb3c68..39642f0 100644 --- a/src/pages.json +++ b/src/pages.json @@ -50,6 +50,14 @@ ] }, "pages": [ + { + "path": "pages/mine/mine", + "type": "home", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "首页" + } + }, { "path": "pages/home/home", "type": "home", @@ -169,6 +177,14 @@ }, "needLogin": false }, + { + "path": "pages/info-publish/add-release-plan", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/info-publish/announce-notice", "type": "page", @@ -193,9 +209,29 @@ "navigationStyle": "custom" } }, + { + "path": "pages/info-publish/edit-pic-video", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/info-publish/info-publish", - "type": "page" + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/info-publish/material-library", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } }, { "path": "pages/info-publish/notice-details", @@ -213,6 +249,22 @@ "navigationStyle": "custom" } }, + { + "path": "pages/info-publish/play-content-library", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/info-publish/release-plan", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/login/login", "type": "page", @@ -243,6 +295,14 @@ }, "needLogin": false }, + { + "path": "pages/select-member-or-department/select-member-or-department", + "type": "page", + "style": { + "navigationStyle": "custom", + "disableScroll": true + } + }, { "path": "pages/workbench/workbench", "type": "page" @@ -297,4 +357,4 @@ } ], "subPackages": [] -} +} \ No newline at end of file diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue index 4f2a1c8..d331ce8 100644 --- a/src/pages/approval/components/Components.vue +++ b/src/pages/approval/components/Components.vue @@ -61,12 +61,21 @@ @change="changeDate" > - + + + + + @@ -78,6 +87,7 @@ import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue' import Images from '@/pages/approval/components/Images.vue' import Description from '@/pages/approval/components/Description.vue' + import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue' const columns = ref>([ { diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue new file mode 100644 index 0000000..5339c4c --- /dev/null +++ b/src/pages/approval/components/MemberOrDepartment.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue new file mode 100644 index 0000000..2b3c360 --- /dev/null +++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select-member-or-department/components/SearchItem.vue new file mode 100644 index 0000000..9a13733 --- /dev/null +++ b/src/pages/select-member-or-department/components/SearchItem.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue new file mode 100644 index 0000000..f3a80e6 --- /dev/null +++ b/src/pages/select-member-or-department/select-member-or-department.vue @@ -0,0 +1,275 @@ + +{ + style: { + navigationStyle: 'custom', + disableScroll: true + } +} + + + + + + diff --git a/src/static/images/icon_delete.png b/src/static/images/icon_delete.png new file mode 100644 index 0000000..10c193f Binary files /dev/null and b/src/static/images/icon_delete.png differ diff --git a/src/static/images/icon_file.png b/src/static/images/icon_file.png new file mode 100644 index 0000000..5a8886b Binary files /dev/null and b/src/static/images/icon_file.png differ diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index b4660c3..8e6bfdb 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -20,16 +20,22 @@ interface NavigateToOptions { "/pages/attendance/issue-record" | "/pages/code/code" | "/pages/get-code/get-code" | + "/pages/info-publish/add-release-plan" | "/pages/info-publish/announce-notice" | "/pages/info-publish/basic-info" | "/pages/info-publish/drafts-list" | + "/pages/info-publish/edit-pic-video" | "/pages/info-publish/info-publish" | + "/pages/info-publish/material-library" | "/pages/info-publish/notice-details" | "/pages/info-publish/notice-manage" | + "/pages/info-publish/play-content-library" | + "/pages/info-publish/release-plan" | "/pages/login/login" | "/pages/notification/notification" | "/pages/personnel-passage/traffic-correlation" | "/pages/reset-password/reset-password" | + "/pages/select-member-or-department/select-member-or-department" | "/pages/workbench/workbench" | "/pages/attendance/attendance-add-group/attendance-add-group" | "/pages/attendance/attendance-add-group/attendance-device" |