diff --git a/src/components/TeamPopup/TeamPopup.vue b/src/components/TeamPopup/TeamPopup.vue index b9e73f1..d120885 100644 --- a/src/components/TeamPopup/TeamPopup.vue +++ b/src/components/TeamPopup/TeamPopup.vue @@ -56,10 +56,11 @@ diff --git a/src/pages/approval/approval.vue b/src/pages/approval/approval.vue index 5c80404..09b0ea5 100644 --- a/src/pages/approval/approval.vue +++ b/src/pages/approval/approval.vue @@ -7,14 +7,20 @@ } + + diff --git a/src/pages/approval/components/ApprovalContent.vue b/src/pages/approval/components/ApprovalContent.vue new file mode 100644 index 0000000..031fa1d --- /dev/null +++ b/src/pages/approval/components/ApprovalContent.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/pages/approval/components/ApprovalCreate.vue b/src/pages/approval/components/ApprovalCreate.vue new file mode 100644 index 0000000..ab6071f --- /dev/null +++ b/src/pages/approval/components/ApprovalCreate.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/pages/approval/components/ApprovalProcess.vue b/src/pages/approval/components/ApprovalProcess.vue new file mode 100644 index 0000000..c999f2d --- /dev/null +++ b/src/pages/approval/components/ApprovalProcess.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/pages/approval/components/ApprovalRecords.vue b/src/pages/approval/components/ApprovalRecords.vue new file mode 100644 index 0000000..9d24188 --- /dev/null +++ b/src/pages/approval/components/ApprovalRecords.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/pages/approval/components/DatetimePicker.vue b/src/pages/approval/components/DatetimePicker.vue new file mode 100644 index 0000000..338eed4 --- /dev/null +++ b/src/pages/approval/components/DatetimePicker.vue @@ -0,0 +1,273 @@ + + + diff --git a/src/pages/approval/components/DatetimePickerGroup.vue b/src/pages/approval/components/DatetimePickerGroup.vue new file mode 100644 index 0000000..3d3142d --- /dev/null +++ b/src/pages/approval/components/DatetimePickerGroup.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/pages/approval/components/Description.vue b/src/pages/approval/components/Description.vue new file mode 100644 index 0000000..5bed04c --- /dev/null +++ b/src/pages/approval/components/Description.vue @@ -0,0 +1,18 @@ + + + diff --git a/src/pages/approval/components/Form.vue b/src/pages/approval/components/Form.vue new file mode 100644 index 0000000..3538184 --- /dev/null +++ b/src/pages/approval/components/Form.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/pages/approval/components/Images.vue b/src/pages/approval/components/Images.vue new file mode 100644 index 0000000..c1b3798 --- /dev/null +++ b/src/pages/approval/components/Images.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/pages/approval/components/Input.vue b/src/pages/approval/components/Input.vue new file mode 100644 index 0000000..d24115a --- /dev/null +++ b/src/pages/approval/components/Input.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/pages/approval/components/Keyboard.vue b/src/pages/approval/components/Keyboard.vue new file mode 100644 index 0000000..7713ec5 --- /dev/null +++ b/src/pages/approval/components/Keyboard.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/pages/approval/components/Leave.vue b/src/pages/approval/components/Leave.vue new file mode 100644 index 0000000..b7bade7 --- /dev/null +++ b/src/pages/approval/components/Leave.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/pages/approval/components/NavigatorSelector.vue b/src/pages/approval/components/NavigatorSelector.vue new file mode 100644 index 0000000..fe88998 --- /dev/null +++ b/src/pages/approval/components/NavigatorSelector.vue @@ -0,0 +1,94 @@ + + + diff --git a/src/pages/approval/components/Overtime.vue b/src/pages/approval/components/Overtime.vue new file mode 100644 index 0000000..683a52c --- /dev/null +++ b/src/pages/approval/components/Overtime.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/pages/approval/components/SelectPicker.vue b/src/pages/approval/components/SelectPicker.vue new file mode 100644 index 0000000..65aad0e --- /dev/null +++ b/src/pages/approval/components/SelectPicker.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/pages/approval/components/Textarea.vue b/src/pages/approval/components/Textarea.vue new file mode 100644 index 0000000..d870304 --- /dev/null +++ b/src/pages/approval/components/Textarea.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/pages/approval/components/VisitDuration.vue b/src/pages/approval/components/VisitDuration.vue new file mode 100644 index 0000000..87d89b8 --- /dev/null +++ b/src/pages/approval/components/VisitDuration.vue @@ -0,0 +1,194 @@ + + + diff --git a/src/pages/approval/components/Visitor.vue b/src/pages/approval/components/Visitor.vue new file mode 100644 index 0000000..1f8ac23 --- /dev/null +++ b/src/pages/approval/components/Visitor.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/src/pages/approval/create-application.vue b/src/pages/approval/create-application.vue new file mode 100644 index 0000000..1b2cf46 --- /dev/null +++ b/src/pages/approval/create-application.vue @@ -0,0 +1,42 @@ + +{ + style: { + navigationStyle: 'custom', + disableScroll: true + } +} + + + + diff --git a/src/pages/attendance/attendance.vue b/src/pages/attendance/attendance.vue index 92cfe85..bb290ec 100644 --- a/src/pages/attendance/attendance.vue +++ b/src/pages/attendance/attendance.vue @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/pages/application-list/application-list.vue b/src/pages/home/application-list.vue similarity index 100% rename from src/pages/application-list/application-list.vue rename to src/pages/home/application-list.vue diff --git a/src/pages/home/HomeAddDevice.vue b/src/pages/home/compoents/HomeAddDevice.vue similarity index 100% rename from src/pages/home/HomeAddDevice.vue rename to src/pages/home/compoents/HomeAddDevice.vue diff --git a/src/pages/home/HomeAddTeamManager.vue b/src/pages/home/compoents/HomeAddTeamManager.vue similarity index 100% rename from src/pages/home/HomeAddTeamManager.vue rename to src/pages/home/compoents/HomeAddTeamManager.vue diff --git a/src/pages/home/HomeAttendance.vue b/src/pages/home/compoents/HomeAttendance.vue similarity index 100% rename from src/pages/home/HomeAttendance.vue rename to src/pages/home/compoents/HomeAttendance.vue diff --git a/src/pages/home/HomeBulletin.vue b/src/pages/home/compoents/HomeBulletin.vue similarity index 100% rename from src/pages/home/HomeBulletin.vue rename to src/pages/home/compoents/HomeBulletin.vue diff --git a/src/pages/home/HomeOpenDoor.vue b/src/pages/home/compoents/HomeOpenDoor.vue similarity index 100% rename from src/pages/home/HomeOpenDoor.vue rename to src/pages/home/compoents/HomeOpenDoor.vue diff --git a/src/pages/home/HomeSetting.vue b/src/pages/home/compoents/HomeSetting.vue similarity index 100% rename from src/pages/home/HomeSetting.vue rename to src/pages/home/compoents/HomeSetting.vue diff --git a/src/pages/home/HomeSwiper.vue b/src/pages/home/compoents/HomeSwiper.vue similarity index 100% rename from src/pages/home/HomeSwiper.vue rename to src/pages/home/compoents/HomeSwiper.vue diff --git a/src/pages/home/HomeTab.vue b/src/pages/home/compoents/HomeTab.vue similarity index 96% rename from src/pages/home/HomeTab.vue rename to src/pages/home/compoents/HomeTab.vue index f124fe2..00caea8 100644 --- a/src/pages/home/HomeTab.vue +++ b/src/pages/home/compoents/HomeTab.vue @@ -50,7 +50,7 @@ const clickMenu = () => { uni.navigateTo({ - url: '/pages/application-list/application-list' + url: '/pages/home/application-list' }) } diff --git a/src/pages/home/HomeTeamManager.vue b/src/pages/home/compoents/HomeTeamManager.vue similarity index 100% rename from src/pages/home/HomeTeamManager.vue rename to src/pages/home/compoents/HomeTeamManager.vue diff --git a/src/pages/home/HomeTodo.vue b/src/pages/home/compoents/HomeTodo.vue similarity index 100% rename from src/pages/home/HomeTodo.vue rename to src/pages/home/compoents/HomeTodo.vue diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue index 1ed0009..233a012 100644 --- a/src/pages/home/home.vue +++ b/src/pages/home/home.vue @@ -40,7 +40,7 @@ - + @@ -56,25 +56,26 @@ diff --git a/src/pages/code/code.vue b/src/pages/login/code.vue similarity index 97% rename from src/pages/code/code.vue rename to src/pages/login/code.vue index 04ac263..3f72908 100644 --- a/src/pages/code/code.vue +++ b/src/pages/login/code.vue @@ -124,7 +124,7 @@ } } else if (type.value === 'reset-password') { await uni.redirectTo({ - url: `/pages/reset-password/reset-password?phone=${phone.value}&code=${code.value}` + url: `/pages/login/reset-password?phone=${phone.value}&code=${code.value}` }) } } @@ -159,4 +159,8 @@ border: #b8b8b8 solid 2rpx; border-radius: 12rpx; } + + page { + background-color: #ffffff; + } diff --git a/src/pages/get-code/get-code.vue b/src/pages/login/get-code.vue similarity index 93% rename from src/pages/get-code/get-code.vue rename to src/pages/login/get-code.vue index 22720bd..574fe38 100644 --- a/src/pages/get-code/get-code.vue +++ b/src/pages/login/get-code.vue @@ -63,7 +63,7 @@ uni.hideLoading() if (result.errorCode === Result.Success.code) { await uni.navigateTo({ - url: `/pages/reset-password/reset-password?phone=${phone.value}` + url: `/pages/login/reset-password?phone=${phone.value}` }) } else { await uni.showToast({ @@ -85,3 +85,9 @@ phone.value = value } + + diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index c9cc32b..48f0e18 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -61,7 +61,7 @@ :disabled="!phonePass" :round="false" size="large" - @click="codeLogin" + @click="codeLogin(false, $event)" > 获取验证码 @@ -264,7 +264,7 @@ }) uni.hideLoading() if (result.errorCode === Result.Success.code) { - let url = `/pages/code/code?phone=${phone.value}&type=login` + let url = `/pages/login/code?phone=${phone.value}&type=login` if (tip) { url = url + `&tip=true` } @@ -298,7 +298,7 @@ params = `?phone=${phone.value}` } uni.navigateTo({ - url: `/pages/get-code/get-code${params}` + url: `/pages/login/get-code${params}` }) } @@ -325,3 +325,9 @@ consentAgreement.value = !consentAgreement.value } + + diff --git a/src/pages/reset-password/reset-password.vue b/src/pages/login/reset-password.vue similarity index 98% rename from src/pages/reset-password/reset-password.vue rename to src/pages/login/reset-password.vue index c70afde..d89595f 100644 --- a/src/pages/reset-password/reset-password.vue +++ b/src/pages/login/reset-password.vue @@ -226,4 +226,8 @@ } - + diff --git a/src/pages/mine/mine.vue b/src/pages/mine/mine.vue index 2e79a40..4d7711c 100644 --- a/src/pages/mine/mine.vue +++ b/src/pages/mine/mine.vue @@ -1,4 +1,4 @@ - + { style: { navigationStyle: 'custom', diff --git a/src/pages/select/components/OrganizationItem.vue b/src/pages/select/components/OrganizationItem.vue new file mode 100644 index 0000000..a845b28 --- /dev/null +++ b/src/pages/select/components/OrganizationItem.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/pages/select/components/SearchItem.vue b/src/pages/select/components/SearchItem.vue new file mode 100644 index 0000000..eb3ce14 --- /dev/null +++ b/src/pages/select/components/SearchItem.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/pages/select/select-access-control.vue b/src/pages/select/select-access-control.vue new file mode 100644 index 0000000..57dfd24 --- /dev/null +++ b/src/pages/select/select-access-control.vue @@ -0,0 +1,100 @@ + +{ + style: { + navigationStyle: 'custom', + disableScroll: true + } +} + + + + + + diff --git a/src/pages/select/select-organization.vue b/src/pages/select/select-organization.vue new file mode 100644 index 0000000..779490c --- /dev/null +++ b/src/pages/select/select-organization.vue @@ -0,0 +1,276 @@ + +{ + style: { + navigationStyle: 'custom', + disableScroll: true + } +} + + + + + + diff --git a/src/static/images/icon_airplane.png b/src/static/images/icon_airplane.png new file mode 100644 index 0000000..090beac Binary files /dev/null and b/src/static/images/icon_airplane.png differ diff --git a/src/static/images/icon_approval.png b/src/static/images/icon_approval.png new file mode 100644 index 0000000..0c4943f Binary files /dev/null and b/src/static/images/icon_approval.png differ diff --git a/src/static/images/icon_default_avatar.png b/src/static/images/icon_default_avatar.png new file mode 100644 index 0000000..b93dfad Binary files /dev/null and b/src/static/images/icon_default_avatar.png differ 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 51ebdf9..eb8731c 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -4,10 +4,10 @@ // Generated by vite-plugin-uni-pages interface NavigateToOptions { - url: "/pages/mine/mine" | - "/pages/home/home" | - "/pages/application-list/application-list" | + url: "/pages/home/home" | + "/pages/approval/approval-detail" | "/pages/approval/approval" | + "/pages/approval/create-application" | "/pages/attendance/allowed-time" | "/pages/attendance/attendance-rules" | "/pages/attendance/attendance" | @@ -16,18 +16,27 @@ interface NavigateToOptions { "/pages/attendance/flexible-punching" | "/pages/attendance/issue-record-detail" | "/pages/attendance/issue-record" | - "/pages/code/code" | - "/pages/get-code/get-code" | + "/pages/home/application-list" | + "/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/code" | + "/pages/login/get-code" | "/pages/login/login" | + "/pages/login/reset-password" | + "/pages/mine/mine" | "/pages/notification/notification" | "/pages/personnel-passage/traffic-correlation" | - "/pages/reset-password/reset-password" | + "/pages/select/select-access-control" | + "/pages/select/select-organization" | "/pages/workbench/workbench" | "/pages/attendance/attendance-add-group/attendance-add-group" | "/pages/attendance/attendance-add-group/attendance-device" |