diff --git a/src/assets/images/menu/icon/mine.png b/src/assets/images/menu/icon/mine.png new file mode 100644 index 0000000..aea36b3 Binary files /dev/null and b/src/assets/images/menu/icon/mine.png differ diff --git a/src/components/layouts/RouteViewMobile.vue b/src/components/layouts/RouteViewMobile.vue new file mode 100644 index 0000000..46fcb28 --- /dev/null +++ b/src/components/layouts/RouteViewMobile.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/components/menu/FirstLevelMenu.vue b/src/components/menu/FirstLevelMenu.vue index b6b20e6..6a5d1a0 100644 --- a/src/components/menu/FirstLevelMenu.vue +++ b/src/components/menu/FirstLevelMenu.vue @@ -199,8 +199,6 @@ export default { color: rgba(255,255,255,0.96); line-height: 19px; text-shadow: 0 4px 4px rgba(0,0,0,0.25); - font-style: normal; - text-transform: none; transform: translateY(-10px); } @@ -217,9 +215,6 @@ export default { color: #FFC97A; line-height: 19px; text-shadow: 0 4px 4px rgba(0,0,0,0.25); - text-align: left; - font-style: normal; - text-transform: none; } } } diff --git a/src/components/menu/MobileMenu.vue b/src/components/menu/MobileMenu.vue new file mode 100644 index 0000000..2843a49 --- /dev/null +++ b/src/components/menu/MobileMenu.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index cd892a1..6f7591e 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -2,11 +2,11 @@ -
+ +
@@ -18,27 +18,19 @@ :collapsed="collapsed" @select="selectFirstLevelMenu"/>
- -
-
-
- -
- - -
- -
- + +
+
+
+
+ + + + + + + +
@@ -263,24 +255,6 @@ export default { } } - .top-nav-header-index { - - .header-index-wide { - margin-left: 10px; - - .ant-menu.ant-menu-horizontal { - height: @height; - line-height: @height; - } - } - .trigger { - line-height: 64px; - &:hover { - background: rgba(0, 0, 0, 0.05); - } - } - } - .header { z-index: 2; //color: #333; @@ -304,13 +278,14 @@ export default { } } .ant-layout-header { - height: 158px; line-height: @height; background-color: transparent; } /* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/ - .global-header { + // pc端 + .global-header-desktop { + height: 158px; position: relative; background-color: #001125; background-image: url("~@/assets/images/header/header-bg.png"); @@ -318,4 +293,27 @@ export default { background-size: auto 100%; background-repeat: no-repeat; } + // 移动端 + .global-header-mobile { + height: .88rem; + background-color: #001125; + background-repeat: no-repeat; + background-image: url("~@/assets/images/system-title.png"); + background-position: center center; + background-size: 2.88rem; + } + .mobile-header { + display: flex; + justify-content: space-between; + height: .88rem; + + .mobile-header-left { + width: .88rem; + } + + .mobile-header-right { + width: .88rem; + text-align: center; + } + } diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index 55f8e9a..767c285 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -16,7 +16,7 @@ @selectFirstLevelMenu="selectFirstLevelMenu" /> - + - - - - + + + + + + + + + + + + + @@ -55,6 +65,7 @@ import { triggerWindowResizeEvent } from '@/utils/util' import { mapActions, mapState } from 'vuex' import { mixin, mixinDevice } from '@/utils/mixin.js' import FirstLevelMenu from '@comp/menu/FirstLevelMenu' +import MobileMenu from '@comp/menu/MobileMenu' // update-start---- author:os_chengtgen -- date:20190830 -- for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------ // import SettingDrawer from '@/components/setting/SettingDrawer' // 注释这个因为在个人设置模块已经加载了SettingDrawer页面 @@ -63,6 +74,7 @@ import FirstLevelMenu from '@comp/menu/FirstLevelMenu' export default { name: 'GlobalLayout', components: { + MobileMenu, FirstLevelMenu, SMenu, GlobalHeader, @@ -158,6 +170,18 @@ export default { + + diff --git a/src/views/mobile/manage/Manage.vue b/src/views/mobile/manage/Manage.vue new file mode 100644 index 0000000..ff1f3a0 --- /dev/null +++ b/src/views/mobile/manage/Manage.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/mobile/mine/Mine.vue b/src/views/mobile/mine/Mine.vue new file mode 100644 index 0000000..4c9091b --- /dev/null +++ b/src/views/mobile/mine/Mine.vue @@ -0,0 +1,13 @@ + + + + +