diff --git a/index.html b/index.html index 3dcf359..764f37a 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@ - + diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..146e0ad Binary files /dev/null and b/public/favicon.ico differ diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 81cc672..5529f96 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -5,7 +5,7 @@
- +
diff --git a/src/page/index/setting.vue b/src/page/index/setting.vue index c727a1f..a5a8869 100644 --- a/src/page/index/setting.vue +++ b/src/page/index/setting.vue @@ -4,9 +4,10 @@
菜单风格
- 默认 - 风格一 - 风格二 + 风格一 + 风格二 + 风格三 + 风格四 - +
diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue index 556ca07..481ff3c 100644 --- a/src/page/index/top/top-menu.vue +++ b/src/page/index/top/top-menu.vue @@ -1,64 +1,51 @@ - - - --> -
-
-
- - {{ item.name }} +
-
-
- - - + + + +
@@ -76,7 +63,7 @@ export default { }, // activeIndex: '0', items: [], - timer:null + timer: null }; }, inject: ['index'], @@ -85,11 +72,11 @@ export default { this.interval() }, computed: { - ...mapGetters(['tagCurrent', 'menu', 'tagWel','activeIndex','selectIndex','selectedIndex','leftMenu','setting']), + ...mapGetters(['tagCurrent', 'menu', 'tagWel', 'activeIndex', 'selectIndex', 'selectedIndex', 'leftMenu', 'setting']), }, methods: { openMenu(item) { - console.log('item------------------------',item) + console.log('item------------------------', item) this.index.openMenu2(item); this.$store.commit('SET_ACTIVE_INDEX', item.id + ''); }, @@ -97,24 +84,24 @@ export default { this.index.openMenu(itemHome); this.$router.push(this.tagWel); }, - interval(){ + interval() { console.log('1111111111111111111111111111111111111') - this.timer = setInterval(() =>{ + this.timer = setInterval(() => { this.getMenu() - },1000) + }, 1000) }, getMenu() { this.items = this.menu - console.log('menu-------------------------------------',this.menu) - console.log('items-------------------------------------',this.items) - if(this.menu.length != 0){ + console.log('menu222-------------------------------------', this.menu) + console.log('items-------------------------------------', this.items) + if (this.menu.length != 0) { clearInterval(this.timer) } - if(this.activeIndex){ + if (this.activeIndex) { let tmp = this.menu.find(item => item.id == this.activeIndex) this.openMenu(tmp) - }else{ - if(this.menu.length != 0){ + } else { + if (this.menu.length != 0) { this.openMenu(this.menu[0]) } } @@ -131,10 +118,10 @@ export default { };