From a2e6effff7b4faf2f20ddf86936fdbb0f8e3b7e0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 09:30:21 +0800
Subject: [PATCH] no message
Former-commit-id: ebcacc4c35b51fabdedb9bf24451a8b9ed0538a7 [formerly ebcacc4c35b51fabdedb9bf24451a8b9ed0538a7 [formerly ebcacc4c35b51fabdedb9bf24451a8b9ed0538a7 [formerly ebcacc4c35b51fabdedb9bf24451a8b9ed0538a7 [formerly 216cfba8dd9241eb118f912410a8ed9b47f73a4e [formerly bcfedd921c9bad92c44dedcd129515f4eee88ccc]]]]]
Former-commit-id: 56791dd292b6cbafb8b2718fef86d7cde15912fa
Former-commit-id: 9c010dd00d8c289f7b5cf9fb09e2c2382cea8709
Former-commit-id: a0b82a29f70845922f5a4df52bb7483615035037 [formerly 3f32892d7e2dd6cca6ac6548b16347f64b91e813]
Former-commit-id: 0479a1aa8814cf6b6c98fcba6e7ad23c6b3cbf24
Former-commit-id: b233429360f4644df597cbe2dd8742e7c12b58cc
Former-commit-id: f945650ec6a6c981401631d4e4233ac78699c6d5
Former-commit-id: 8d06fe548bae568d816fb936acdf35be400aa565
Former-commit-id: 08a50554c42e95f694c557a1b70c4070ceb27894
---
TODO | 3 +++
.../style/theme/tomorrow-night-blue/setting.scss | 12 ++++++------
.../core/d2-multiple-page-control/index.vue | 15 +++++++++++----
src/router/index.js.REMOVED.git-id | 2 +-
src/store/modules/d2admin.js | 9 ++++++++-
5 files changed, 29 insertions(+), 12 deletions(-)
create mode 100644 TODO
diff --git a/TODO b/TODO
new file mode 100644
index 00000000..a0814dfd
--- /dev/null
+++ b/TODO
@@ -0,0 +1,3 @@
+
+Todo:
+ ☐ Item
diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss
index de637b5b..f80e797f 100644
--- a/src/assets/style/theme/tomorrow-night-blue/setting.scss
+++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss
@@ -29,26 +29,26 @@ $theme-header-item-color: #FF929A;
$theme-header-item-background-color: transparent;
// 顶栏上的项目在 hover 时
$theme-header-item-color-hover: #FFEBA4;
-$theme-header-item-background-color-hover: #00162D;
+$theme-header-item-background-color-hover: rgba(#FFF, .05);
// 顶栏上的项目在 focus 时
$theme-header-item-color-focus: #FFB870;
-$theme-header-item-background-color-focus: #00162D;
+$theme-header-item-background-color-focus: rgba(#FFF, .05);
// 顶栏上的项目在 active 时
$theme-header-item-color-active: #FFB870;
-$theme-header-item-background-color-active: #00162D;
+$theme-header-item-background-color-active: rgba(#FFF, .05);
// 侧边栏上的文字颜色
$theme-aside-item-color: #FF929A;
$theme-aside-item-background-color: transparent;
// 侧边栏上的项目在 hover 时
$theme-aside-item-color-hover: #FFEBA4;
-$theme-aside-item-background-color-hover: #00162D;
+$theme-aside-item-background-color-hover: rgba(#FFF, .05);
// 侧边栏上的项目在 focus 时
$theme-aside-item-color-focus: #FFB870;
-$theme-aside-item-background-color-focus: #00162D;
+$theme-aside-item-background-color-focus: rgba(#FFF, .05);
// 侧边栏上的项目在 active 时
$theme-aside-item-color-active: #FFB870;
-$theme-aside-item-background-color-active: #00162D;
+$theme-aside-item-background-color-active: rgba(#FFF, .05);
// 侧边栏菜单为空的时候显示的元素
$theme-aside-menu-empty-icon-color: #FFB870;
diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 69ffb473..4091e85b 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -5,20 +5,27 @@
type="card"
@tab-click="handleClick">
+ v-for="(page, index) in pageList"
+ :key="index"
+ :label="page.title"
+ :name="page.name">
+