fix bug

uncleLian · Apr 19, 2019 · 74274a3 · 74274a3
1 parent 53cb71a
commit 74274a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dropdown class="userSelect" placement="bottom" trigger="click" @command="onSelected">
         <div class="userSelect-container">
-            <img :src="user.headimgurl">
+            <img src="~@/assets/img/logo.png">
             <span>{{user.nickname}}</span>
         </div>
         <el-dropdown-menu slot="dropdown">

diff --git a/src/router/index.js b/src/router/index.js
@@ -84,13 +84,16 @@ function setRedirect(routes, redirect = '') {
     routes.forEach(route => {
         if (route.children && route.children.length > 0) {
             if (!route.redirect) {
-                let redirectIndex = route.meta && route.meta.redirectIndex ? route.meta.redirectIndex : 0
-                let redirectRoute = route.children[redirectIndex]
-                let redirectName = redirectRoute && redirectRoute.name ? redirectRoute.name : route.children[0].name
+                let defaultRedirectRoute = route.children.filter(item => !item.meta || !item.meta.hidden)[0]
+                let redirectIndex = route.meta && route.meta.redirectIndex
+                if (redirectIndex) {
+                    defaultRedirectRoute = route.children[redirectIndex]
+                }
+                let redirectName = defaultRedirectRoute.name
                 route.redirect = `${redirect}/${route.name}/${redirectName}`
             }
-            let index = route.redirect.lastIndexOf('/')
-            let fatherDir = route.redirect.substring(0, index)
+            let index = route.redirect && route.redirect.lastIndexOf('/')
+            let fatherDir = route.redirect && route.redirect.substring(0, index)
             route.children = setRedirect(route.children, fatherDir)
         }
     })