diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue new file mode 100644 index 000000000..1f2c0dcc4 --- /dev/null +++ b/resources/assets/js/components/Mobile/Tabbar.vue @@ -0,0 +1,93 @@ + + + diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 96d5b16ac..04931a3c0 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -1,5 +1,5 @@ @@ -363,14 +366,16 @@ import TeamManagement from "./manage/components/TeamManagement"; import ProjectManagement from "./manage/components/ProjectManagement"; import DrawerOverlay from "../components/DrawerOverlay"; import DragBallComponent from "../components/DragBallComponent"; +import MobileTabbar from "../components/Mobile/Tabbar"; +import UserInput from "../components/UserInput"; import TaskAdd from "./manage/components/TaskAdd"; import Report from "./manage/components/Report"; import notificationKoro from "notification-koro1"; import {Store} from "le5le-store"; -import UserInput from "../components/UserInput"; export default { components: { + MobileTabbar, UserInput, TaskAdd, TaskDetail, @@ -384,7 +389,6 @@ export default { return { loadIng: 0, - routeName: this.$route.name, mateName: /macintosh|mac os x/i.test(navigator.userAgent) ? '⌘' : 'Ctrl', addShow: false, @@ -496,6 +500,10 @@ export default { ...mapGetters(['taskData', 'dashboardTask']), + routeName() { + return this.$route.name + }, + msgUnreadMention() { let num = 0; let mention = 0; @@ -601,13 +609,6 @@ export default { return data; }, - taskStyle() { - const {windowHeight} = this; - return { - maxHeight: (windowHeight - (windowHeight > 900 ? 200 : 70) - 20) + 'px' - } - }, - overlayClass() { return { 'overlay-y': true, @@ -621,11 +622,23 @@ export default { return cacheTasks.find(task => task.id === id) || {} }); }, + + showMobileTabbar() { + if (this.routeName === 'manage-dashboard') { + return true; + } + if (this.routeName === 'manage-project' && !/^\d+$/.test(this.$route.params.projectId)) { + return true; + } + if (this.routeName === 'manage-messenger' && !/^\d+$/.test(this.$route.params.dialogId)) { + return true; + } + return $A.leftExists(this.routeName, 'manage-setting'); + }, }, watch: { '$route' (route) { - this.routeName = route.name; this.chackPass(); }, @@ -792,7 +805,7 @@ export default { classNameProject(item) { return { - "active": this.routeName === 'manage-project' && this.$route.params.projectId === item.id, + "active": this.routeName === 'manage-project' && this.$route.params.projectId == item.id, "open-menu": this.openMenu[item.id] === true, "operate": item.id == this.topOperateItem.id && this.topOperateVisible }; diff --git a/resources/assets/js/pages/manage/components/ProjectAll.vue b/resources/assets/js/pages/manage/components/ProjectAll.vue new file mode 100644 index 000000000..aaffa4e6d --- /dev/null +++ b/resources/assets/js/pages/manage/components/ProjectAll.vue @@ -0,0 +1,36 @@ + + + diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index cec1016aa..1d6ada8d9 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -1,6 +1,6 @@