From 3dbbedab1918853ce15d40d9080abd44f8117524 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 1 Jul 2018 17:05:08 +0800
Subject: [PATCH] no message

Former-commit-id: f87e264d803b23c56c6e6712ec1d2634b50506e1 [formerly f87e264d803b23c56c6e6712ec1d2634b50506e1 [formerly f87e264d803b23c56c6e6712ec1d2634b50506e1 [formerly f87e264d803b23c56c6e6712ec1d2634b50506e1 [formerly 7d74baa4d8735b5d53d887764596718a452eb882 [formerly 2d951cb28db647f9625b2cbc51a9044662bb6ba6]]]]]
Former-commit-id: 114d9468457a4726368f5b5b6d623bf37ba1c62f
Former-commit-id: 5e998690676c64c6802d74841e3227c169fe3657
Former-commit-id: 1ae7da9fb2ab678d06cc46a206440c661fa19778 [formerly b41944d9b4d60f08dbc231ffc4bdc6409cb56190]
Former-commit-id: ef76da60c7f97f35b784cd365bb4376c514c5443
Former-commit-id: 7515c1cf89bc0c3061d491303108b75f0c4d4b2f
Former-commit-id: e8335658051fc72cfba71f7d86b420584173e205
Former-commit-id: eb02daa9d354d9795825a42e96137ba020325f3c
Former-commit-id: 5cb1c7907d8e9c6f7d46750b5d90d8bd3d0e43a4
---
 .../core/d2-multiple-page-control/index.vue     |  2 +-
 src/router/routes.js.REMOVED.git-id             |  2 +-
 src/store/modules/d2admin.js                    | 17 ++++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 43a9b469..262584c6 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -12,7 +12,7 @@
           <el-tab-pane
             v-for="(page, index) in pageOpenedList"
             :key="index"
-            :label="page.name"
+            :label="page.meta.title || '未命名'"
             :name="page.name">
           </el-tab-pane>
         </el-tabs>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 4b19a510..24682293 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-7cc39e5aa61631be559f5b0319ee5a1915748943
\ No newline at end of file
+bb07b3ba57519000163de64466fa95e4ce348572
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 9bf06016..8e3d4383 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -15,7 +15,13 @@ export default {
     tagPool: [],
     // 当前显示的多页面列表
     pageOpenedList: [
-      { name: 'index', title: '首页' }
+      {
+        name: 'index',
+        meta: {
+          title: '首页',
+          requiresAuth: false
+        }
+      }
     ],
     // 当前页面
     pageCurrent: ''
@@ -87,11 +93,12 @@ export default {
      */
     d2adminTagIncreate (state, { tag, argu, query }) {
       // 设置新的 tag 在新打开一个以前没打开过的页面时使用
-      let newTag = tag
-      newTag.argu = argu || newTag.argu
-      newTag.query = query || newTag.query
+      let newPage = tag
+      newPage.argu = argu || newPage.argu
+      newPage.query = query || newPage.query
+      newPage.argu = argu || newPage.argu
       // 添加进当前显示的页面数组
-      state.pageOpenedList.push(newTag)
+      state.pageOpenedList.push(newPage)
       // 更新设置到数据库
       this.commit('d2adminVuex2Db', 'pageOpenedList')
     },