修复标签导航bug

iview · Oct 11, 2018 · 70dffc7 · 70dffc7
1 parent 3bcb620
commit 70dffc7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/main/main.vue b/src/components/main/main.vue
@@ -145,10 +145,10 @@ export default {
     /**
      * @description 初始化设置面包屑导航和标签导航
      */
+    this.setTagNavList()
     this.addTag({
       route: this.$store.state.app.homeRoute
     })
-    this.setTagNavList()
     this.setBreadCrumb(this.$route)
     // 设置初始语言
     this.setLocal(this.$i18n.locale)

diff --git a/src/store/module/app.js b/src/store/module/app.js
@@ -44,9 +44,9 @@ export default {
       if (list) {
         tagList = [...list]
       } else tagList = getTagNavListFromLocalstorage()
-      if (tagList[0].name !== homeName) tagList.shift()
+      if (tagList[0] && tagList[0].name !== homeName) tagList.shift()
       let homeTagIndex = tagList.findIndex(item => item.name === homeName)
-      if (homeTagIndex !== 0) {
+      if (homeTagIndex > 0) {
         let homeTag = tagList.splice(homeTagIndex, 1)[0]
         tagList.unshift(homeTag)
       }