From cad161104c6f1a3e3d0d41593dec8664a7371c9a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 27 Oct 2018 18:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AE=BE=E7=BD=AE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68 [formerly 9ebaa44ba31bf6b89e6a26e7c880694317c10849 [formerly 6915b7b392bbf51a784a7a60faa5805e05749e62]]]]]
Former-commit-id: 0500901750714d3f756cdab974061f703c54a20c
Former-commit-id: 718d0d4f016503154f4d76b983fac52135d12ba8
Former-commit-id: f393f36317e7bfce386b8e8bd04d8a378552187d [formerly 74aef31060be3c3f360e1b902f5472d60ed3f360]
Former-commit-id: eacb846db5711af1dde9627b5df3001bfe524429
Former-commit-id: 00763a56295e33408b38497fd2c2ab89c635c8c9
Former-commit-id: 9447f0f2beb288dd1b07dae908148c02811cea2c
Former-commit-id: 713f4784cbf5ad1f49e8f599438cb395fcbf9d3d
Former-commit-id: e9835fb631ab8e6bff51fa25eecf1781bdb14f0f
---
 src/router/modules/playground.js                         | 4 ++--
 src/store/modules/d2admin/modules/page.js.REMOVED.git-id | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/router/modules/playground.js b/src/router/modules/playground.js
index 5f0d069b..504055ed 100644
--- a/src/router/modules/playground.js
+++ b/src/router/modules/playground.js
@@ -10,8 +10,8 @@ export default {
   component: layoutHeaderAside,
   children: (pre => [
     { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/playground/index'), meta: { ...meta, title: '试验台首页' } },
-    { path: 'page-cache/on', name: `${pre}page-cache-on`, component: () => import('@/pages/demo/playground/page-cache/on.vue'), meta: { ...meta, title: '开启缓存' } },
-    { path: 'page-cache/off', name: `${pre}page-cache-off`, component: () => import('@/pages/demo/playground/page-cache/off.vue'), meta: { ...meta, notCache: true, title: '关闭缓存' } },
+    { path: 'page-cache/on', name: `${pre}page-cache-on`, component: () => import('@/pages/demo/playground/page-cache/on.vue'), meta: { ...meta, cache: true, title: '开启缓存' } },
+    { path: 'page-cache/off', name: `${pre}page-cache-off`, component: () => import('@/pages/demo/playground/page-cache/off.vue'), meta: { ...meta, title: '关闭缓存' } },
     { path: 'page-argu/send', name: `${pre}page-argu-send`, component: () => import('@/pages/demo/playground/page-argu/send.vue'), meta: { ...meta, title: '参数传递 发送' } },
     { path: 'page-argu/get/:username', name: `${pre}page-argu-get`, component: () => import('@/pages/demo/playground/page-argu/get.vue'), meta: { ...meta, title: '参数传递 接收' } },
     { path: 'store/menu', name: `${pre}store-menu`, component: () => import('@/pages/demo/playground/store/menu'), meta: { ...meta, title: '菜单控制' } },
diff --git a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
index 682a8b12..6566506e 100644
--- a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
+++ b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
@@ -1 +1 @@
-3cac6fb289611555b60a92937c3b5ba99e7b9ec1
\ No newline at end of file
+78d2ffb63408e98c92632f7fd5d2596dcad9e199
\ No newline at end of file