diff --git a/core/core-frontend/src/assets/svg/mobile/icon_dashboard_filled.svg b/core/core-frontend/src/assets/svg/mobile/icon_dashboard_filled.svg new file mode 100644 index 0000000000..77e22c7813 --- /dev/null +++ b/core/core-frontend/src/assets/svg/mobile/icon_dashboard_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/assets/svg/mobile/icon_dashboard_outlined.svg b/core/core-frontend/src/assets/svg/mobile/icon_dashboard_outlined.svg new file mode 100644 index 0000000000..0c8714516e --- /dev/null +++ b/core/core-frontend/src/assets/svg/mobile/icon_dashboard_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/assets/svg/mobile/icon_home_filled.svg b/core/core-frontend/src/assets/svg/mobile/icon_home_filled.svg new file mode 100644 index 0000000000..1e2bf30f84 --- /dev/null +++ b/core/core-frontend/src/assets/svg/mobile/icon_home_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/assets/svg/mobile/icon_home_outlined.svg b/core/core-frontend/src/assets/svg/mobile/icon_home_outlined.svg new file mode 100644 index 0000000000..efda93da5f --- /dev/null +++ b/core/core-frontend/src/assets/svg/mobile/icon_home_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/assets/svg/mobile/icon_member_filled.svg b/core/core-frontend/src/assets/svg/mobile/icon_member_filled.svg new file mode 100644 index 0000000000..3875cb1cc2 --- /dev/null +++ b/core/core-frontend/src/assets/svg/mobile/icon_member_filled.svg @@ -0,0 +1,4 @@ + + + + diff --git a/core/core-frontend/src/assets/svg/mobile/icon_member_outlined.svg b/core/core-frontend/src/assets/svg/mobile/icon_member_outlined.svg new file mode 100644 index 0000000000..393e75dd3d --- /dev/null +++ b/core/core-frontend/src/assets/svg/mobile/icon_member_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/core-frontend/src/views/mobile/components/DashboardCell.vue b/core/core-frontend/src/views/mobile/components/DashboardCell.vue new file mode 100644 index 0000000000..15caf89527 --- /dev/null +++ b/core/core-frontend/src/views/mobile/components/DashboardCell.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/core/core-frontend/src/views/mobile/components/OrgCell.vue b/core/core-frontend/src/views/mobile/components/OrgCell.vue index 87fabc2b49..eca0a85ca5 100644 --- a/core/core-frontend/src/views/mobile/components/OrgCell.vue +++ b/core/core-frontend/src/views/mobile/components/OrgCell.vue @@ -38,7 +38,9 @@ const handleRightClick = () => { - {{ label }} + + {{ label }} +
@@ -79,7 +81,12 @@ const handleRightClick = () => { font-weight: 400; line-height: 22px; display: flex; + max-width: calc(100% - 32px); align-items: center; + + .text { + width: 100%; + } &.active { color: var(--ed-color-primary); } diff --git a/core/core-frontend/src/views/mobile/components/Workbranch.vue b/core/core-frontend/src/views/mobile/components/Workbranch.vue new file mode 100644 index 0000000000..926a333289 --- /dev/null +++ b/core/core-frontend/src/views/mobile/components/Workbranch.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/core/core-frontend/src/views/mobile/directory/index.vue b/core/core-frontend/src/views/mobile/directory/index.vue index a2a2b0a869..bb4dddb99c 100644 --- a/core/core-frontend/src/views/mobile/directory/index.vue +++ b/core/core-frontend/src/views/mobile/directory/index.vue @@ -4,18 +4,12 @@ import { storeToRefs } from 'pinia' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { BusiTreeRequest } from '@/models/tree/TreeNode' import { interactiveStoreWithOut } from '@/store/modules/interactive' +import DashboardCell from '@/views/mobile/components/DashboardCell.vue' import { useRouter } from 'vue-router' -import VanCell from 'vant/es/cell' import VanSticky from 'vant/es/sticky' -import VanSearch from 'vant/es/search' -import VanCellGroup from 'vant/es/cell-group' import VanNavBar from 'vant/es/nav-bar' -import 'vant/es/cell/style' -import 'vant/es/cell-group/style' import 'vant/es/nav-bar/style' import 'vant/es/sticky/style' -import 'vant/es/search/style' -const keywords = ref() const anyManage = ref(false) const rootManage = ref(false) const tableData = ref([]) @@ -97,34 +91,36 @@ onMounted(() => { - + diff --git a/core/core-frontend/src/views/mobile/home/index.vue b/core/core-frontend/src/views/mobile/home/index.vue index 3c9cbfd0df..c4d3b6aa7b 100644 --- a/core/core-frontend/src/views/mobile/home/index.vue +++ b/core/core-frontend/src/views/mobile/home/index.vue @@ -4,17 +4,16 @@ import { interactiveStoreWithOut } from '@/store/modules/interactive' import { useI18n } from '@/hooks/web/useI18n' import { shortcutOption } from '@/views/workbranch/ShortcutOption' import { useRouter } from 'vue-router' +import Workbranch from '@/views/mobile/components/Workbranch.vue' import request from '@/config/axios' import VanTabs from 'vant/es/tabs' +import VanNavBar from 'vant/es/nav-bar' import VanTab from 'vant/es/tab' -import VanCell from 'vant/es/cell' import VanSticky from 'vant/es/sticky' -import VanCellGroup from 'vant/es/cell-group' import 'vant/es/sticky/style' import 'vant/es/tab/style' +import 'vant/es/nav-bar/style' import 'vant/es/tabs/style' -import 'vant/es/cell/style' -import 'vant/es/cell-group/style' const router = useRouter() const { t } = useI18n() @@ -113,6 +112,7 @@ const formatterTime = val => { + + diff --git a/core/core-frontend/src/views/mobile/index.vue b/core/core-frontend/src/views/mobile/index.vue index 3802bdcd05..dfd5789dea 100644 --- a/core/core-frontend/src/views/mobile/index.vue +++ b/core/core-frontend/src/views/mobile/index.vue @@ -27,9 +27,32 @@ const hiddenTabbar = ref(false) > - 首页 - 目录 - 我的 + + + 工作台 + + 仪表板 + 我的
@@ -44,10 +67,43 @@ const hiddenTabbar = ref(false) width: 100vw; height: 100vh; overflow: hidden; - + --van-nav-bar-height: 44px; + --van-nav-bar-arrow-size: 20px; + --van-nav-bar-icon-color: #1f2329; + --van-nav-bar-title-text-color: #1f2329; + --van-font-bold: 500; + --van-nav-bar-title-font-size: 17px; + --van-tabs-line-height: 40px; + --van-tabs-bottom-bar-width: 56px; + --van-tabs-bottom-bar-color: var(--ed-color-primary); + --van-tab-active-text-color: var(--ed-color-primary); + --van-border-width: 0; + --van-tab-text-color: #646a73; + --van-tabbar-item-text-color: #8f959e; .van-hairline--top-bottom:after { bottom: auto; top: auto; } + + .van-tabbar-item { + .ed-icon { + font-size: 22px !important; + } + .van-tabbar-item__text { + color: #646a73; + font-size: 10px; + font-weight: 400; + line-height: 10px; + } + + &.van-tabbar-item--active { + .van-tabbar-item__text { + color: var(--ed-color-primary); + font-size: 10px; + font-weight: 400; + line-height: 10px; + } + } + } } diff --git a/core/core-frontend/src/views/mobile/personal/index.vue b/core/core-frontend/src/views/mobile/personal/index.vue index 05c9ed48da..a1019b0679 100644 --- a/core/core-frontend/src/views/mobile/personal/index.vue +++ b/core/core-frontend/src/views/mobile/personal/index.vue @@ -148,6 +148,7 @@ const activeTableData = computed(() => { :key="ele.id" :label="ele.name" :nextlevel="ele.children" + :active="name === ele.name" >
@@ -158,12 +159,7 @@ const activeTableData = computed(() => { height: 100vh; width: 100vw; background: #f5f6f7; - --van-nav-bar-height: 44px; - --van-nav-bar-arrow-size: 20px; - --van-nav-bar-icon-color: #1f2329; - --van-nav-bar-title-text-color: #1f2329; - --van-font-bold: 500; - --van-nav-bar-title-font-size: 17px; + .mobile-user-top { padding: 16px; display: flex;