From a43757c436b739ca09b1f7da60bc07ebbe7e4fc3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 18 Jul 2018 11:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0479434a2727c27ae9c1c8665d9b3367bf634654 [formerly 0479434a2727c27ae9c1c8665d9b3367bf634654 [formerly 0479434a2727c27ae9c1c8665d9b3367bf634654 [formerly 0479434a2727c27ae9c1c8665d9b3367bf634654 [formerly 02c67f1d1ea55b60aa2a0aafe939d452ea79ff95 [formerly a7295989f0953b7dfd0e0894173c143a23052e13]]]]]
Former-commit-id: ff6ea6aedb7e2bcaf68c329d744894b6e9a4abd9
Former-commit-id: 94a5e66f6c61b82e994e26a72243e071d8ab4956
Former-commit-id: ae5c7e090e8bf3e05d26ef52019d765265306624 [formerly 3715c68ef8dba70eb2bf7253bc430b0cb6684004]
Former-commit-id: 4c1866bae2969c7c449a24466ffedc2592da78ad
Former-commit-id: 78b763363a225a91cb96f1b6455870801002305c
Former-commit-id: c14a1de9a036c0336d90017038e9eae6963fc51c
Former-commit-id: cbb418396e45a3bdf58c857605f459ef632dde40
Former-commit-id: 02f105e79498b527d1542849c6e025bb51a0ff9c
---
 src/pages/demo/playground/fullscreen/index.vue | 2 +-
 src/pages/demo/playground/gray/index.vue       | 2 +-
 src/pages/demo/playground/page-argu/get.vue    | 2 +-
 src/pages/demo/playground/page-argu/send.vue   | 2 +-
 src/pages/demo/playground/page-cache/off.vue   | 2 +-
 src/pages/demo/playground/page-cache/on.vue    | 2 +-
 src/router/index.js                            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/demo/playground/fullscreen/index.vue b/src/pages/demo/playground/fullscreen/index.vue
index 5826a15b..bb16f8c8 100644
--- a/src/pages/demo/playground/fullscreen/index.vue
+++ b/src/pages/demo/playground/fullscreen/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container class="page-demo-playground-fullscreen">
+  <d2-container type="card" class="page-demo-playground-fullscreen">
     <template slot="header">全屏</template>
     <el-button type="primary" @click="d2adminFullScreenToggle">
       d2adminFullScreenToggle 切换全屏
diff --git a/src/pages/demo/playground/gray/index.vue b/src/pages/demo/playground/gray/index.vue
index fb51b269..243af3cb 100644
--- a/src/pages/demo/playground/gray/index.vue
+++ b/src/pages/demo/playground/gray/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container class="page-demo-playground-gray">
+  <d2-container type="card" class="page-demo-playground-gray">
     <template slot="header">
       <div class="colorful">{{isGrayMode ? 'GRAY' : 'COLORFUL'}}</div>
     </template>
diff --git a/src/pages/demo/playground/page-argu/get.vue b/src/pages/demo/playground/page-argu/get.vue
index 0c3145b1..8264c351 100644
--- a/src/pages/demo/playground/page-argu/get.vue
+++ b/src/pages/demo/playground/page-argu/get.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container>
+  <d2-container type="card">
     <h1 class="d2-mt-0">$route.params.username: {{$route.params.username}}</h1>
     <h1>$route.query.userid: {{$route.query.userid}}</h1>
     <p>你可以尝试返回发送数据页面修改数据重新发送，或者切换到其它页面后刷新浏览器再返回本业观察参数保留</p>
diff --git a/src/pages/demo/playground/page-argu/send.vue b/src/pages/demo/playground/page-argu/send.vue
index ecf37f77..2e1a9225 100644
--- a/src/pages/demo/playground/page-argu/send.vue
+++ b/src/pages/demo/playground/page-argu/send.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container>
+  <d2-container type="card">
     <el-form :model="sendForm" :rules="rules" label-position="top" ref="sendForm">
       <el-form-item label="username 通过动态路由匹配发送" prop="username">
         <el-input v-model="sendForm.username"></el-input>
diff --git a/src/pages/demo/playground/page-cache/off.vue b/src/pages/demo/playground/page-cache/off.vue
index 1952f9fb..03d19b81 100644
--- a/src/pages/demo/playground/page-cache/off.vue
+++ b/src/pages/demo/playground/page-cache/off.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container>
+  <d2-container type="card">
     <template slot="header">这个页面不会被 keep-alive</template>
     <p class="d2-mt-0">在下面的输入框输入任意字符后，切换到其它页面，再回到此页时输入框文字消失，证明没有被缓存</p>
     <el-input v-model="value" placeholder="input here"></el-input>
diff --git a/src/pages/demo/playground/page-cache/on.vue b/src/pages/demo/playground/page-cache/on.vue
index 43650d84..972dfe93 100644
--- a/src/pages/demo/playground/page-cache/on.vue
+++ b/src/pages/demo/playground/page-cache/on.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container>
+  <d2-container type="card">
     <template slot="header">这个页面会被 keep-alive</template>
     <p class="d2-mt-0">在下面的输入框输入任意字符后，切换到其它页面，再回到此页时输入框文字保留，证明被缓存</p>
     <el-input v-model="value" placeholder="input here"></el-input>
diff --git a/src/router/index.js b/src/router/index.js
index 8a1f50c4..5794024c 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,7 +21,7 @@ router.beforeEach((to, from, next) => {
     next({ name: 'is-mobile' })
     return
   }
-  // 如果是电脑访问 is-mobile 页面的话 跳转到首页
+  // 如果是电脑访问 is-mobile 页面的话 -> 跳转到首页
   if (to.name === 'is-mobile' && !util.isMobile()) {
     next({ name: 'index' })
     return