diff --git a/src/main.js b/src/main.js index fc76393..f0fce1a 100644 --- a/src/main.js +++ b/src/main.js @@ -9,7 +9,7 @@ import fastClick from 'fastclick' import infiniteScroll from 'vue-infinite-scroll' import VueTouchKeyboard from 'vue-touch-keyboard' import 'vue-touch-keyboard/dist/vue-touch-keyboard.css' -import { DatePicker, Select, Option, Radio } from 'element-ui' +import { DatePicker, Select, Option, Radio, Menu, MenuItem } from 'element-ui' import { Pagination } from 'vant' // import '@style/layout.styl' import '@style/common.styl' @@ -24,6 +24,8 @@ Vue.use(DatePicker) Vue.use(Select) Vue.use(Option) Vue.use(Radio) +Vue.use(Menu) +Vue.use(MenuItem) Vue.use(Pagination) Vue.use(infiniteScroll) Vue.use(VueTouchKeyboard) diff --git a/src/pages/shells/management/index/index.vue b/src/pages/shells/management/index/index.vue new file mode 100644 index 0000000..efee096 --- /dev/null +++ b/src/pages/shells/management/index/index.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 745931a..5339059 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,6 +3,8 @@ import Router from 'vue-router' const Preload = r => require.ensure([], () => r(require('@page/Preload')), 'Preload') const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup') + +const IndexComponent = r => require.ensure([], () => r(require('@page/shells/management/index/index.vue')), 'shells') // carry const Home = r => require.ensure([], () => r(require('@page/Home')), 'Home') const MovePoint = r => require.ensure([], () => r(require('@page/MovePoint')), 'MovePoint') @@ -37,6 +39,11 @@ export default new Router({ path: '/setup', component: Setup }, + { + path: '/index', + component: IndexComponent, + children: [] + }, { path: '/home', component: Home diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl index 2d4003c..a974ca9 100644 --- a/src/style/iconfont.styl +++ b/src/style/iconfont.styl @@ -1,15 +1,3 @@ -// .delete_icon -// &::before -// content: '\e632' -// .eye_open_icon -// &::before -// content: '\e60a' -// .eye_colse_icon -// &::before -// content: '\e7b2' -// .back_icon -// &::before -// content: '\e644' .icon_dropdown &::before content: '\e65b' @@ -19,9 +7,6 @@ .icon_eyeclose &::before content: '\ee34' -// .dropdown_icon_2 -// &::before -// content:'\e62b' -// .select_icon -// &::before -// content '\e608' \ No newline at end of file +.icon_admin + &::before + content: '\e7a3' \ No newline at end of file diff --git a/src/style/iconfont/iconfont.ttf b/src/style/iconfont/iconfont.ttf index 003e5eb..88a47b8 100644 Binary files a/src/style/iconfont/iconfont.ttf and b/src/style/iconfont/iconfont.ttf differ diff --git a/src/style/iconfont/iconfont.woff b/src/style/iconfont/iconfont.woff index d00e1e4..63b6a0f 100644 Binary files a/src/style/iconfont/iconfont.woff and b/src/style/iconfont/iconfont.woff differ diff --git a/src/style/iconfont/iconfont.woff2 b/src/style/iconfont/iconfont.woff2 index 1a22498..e430731 100644 Binary files a/src/style/iconfont/iconfont.woff2 and b/src/style/iconfont/iconfont.woff2 differ diff --git a/src/style/layout.styl b/src/style/layout.styl index 70eef37..770cd98 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -394,7 +394,7 @@ header color #C0C4CC font-size .14rem &::before - content '\e66d' + content '\e659' .input-cus-wrap position relative display inline-block