From 6d449910b5e2661909be504d0b3f920e65b16a6b Mon Sep 17 00:00:00 2001
From: smallwei <1634566606@qq.com>
Date: Fri, 1 Mar 2019 13:40:18 +0800
Subject: [PATCH] fix #issues3

---
 src/page/index/top/index.vue      |  8 ++++----
 src/page/index/top/top-lang.vue   |  2 +-
 src/page/index/top/top-search.vue | 10 ++++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 0a58b6d..4067ad1 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -13,10 +13,10 @@
            v-if="showMenu">
         <top-menu></top-menu>
       </div>
-      <!--<span class="top-bar__item"
+      <span class="top-bar__item"
             v-if="showSearch">
         <top-search></top-search>
-      </span>-->
+      </span>
     </div>
     <div class="top-bar__right">
       <el-tooltip v-if="showColor"
@@ -93,7 +93,7 @@ import { mapGetters, mapState } from "vuex";
 import { fullscreenToggel, listenfullscreen } from "@/util/util";
 import topLock from "./top-lock";
 import topMenu from "./top-menu";
-// import topSearch from "./top-search";
+import topSearch from "./top-search";
 import topTheme from "./top-theme";
 import topLogs from "./top-logs";
 import topColor from "./top-color";
@@ -102,7 +102,7 @@ export default {
   components: {
     topLock,
     topMenu,
-    // topSearch,
+    topSearch,
     topTheme,
     topLogs,
     topColor,
diff --git a/src/page/index/top/top-lang.vue b/src/page/index/top/top-lang.vue
index 571e602..e3e4b65 100644
--- a/src/page/index/top/top-lang.vue
+++ b/src/page/index/top/top-lang.vue
@@ -31,7 +31,7 @@ export default {
       let tag = this.tag;
       let title = this.$router.$avueRouter.generateTitle(
         tag.label,
-        tag.meta.i18n
+        (tag.meta || {}).i18n
       );
       //根据当前的标签也获取label的值动态设置浏览器标题
       this.$router.$avueRouter.setTitle(title);
diff --git a/src/page/index/top/top-search.vue b/src/page/index/top/top-search.vue
index 94f414b..40efd97 100644
--- a/src/page/index/top/top-search.vue
+++ b/src/page/index/top/top-search.vue
@@ -56,9 +56,11 @@ export default {
       const findMenu = list => {
         for (let i = 0; i < list.length; i++) {
           const ele = Object.assign({}, list[i]);
-          if (ele[this.childrenKey]) findMenu(ele[this.childrenKey]);
-          delete ele[this.childrenKey];
-          this.menuList.push(ele);
+          if (this.validatenull(ele[this.childrenKey])) {
+            this.menuList.push(ele);
+          } else {
+            findMenu(ele[this.childrenKey]);
+          }
         }
       };
       this.menuList = [];
@@ -86,7 +88,7 @@ export default {
         path: this.$router.$avueRouter.getPath({
           name: item[this.labelKey],
           src: item[this.pathKey],
-          i18n: item.meta.i18n
+          i18n: (item.meta || {}).i18n
         }),
         query: item.query
       });