From 1e3fdc92943928499cf02140802895e28c67e8d7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 18 Jul 2018 08:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 59deacc8b9e4922059112e6c570dff3aabe8dbde [formerly 60bf37418278254d92ccea71dd2cd37372c47349] [formerly 59deacc8b9e4922059112e6c570dff3aabe8dbde [formerly 60bf37418278254d92ccea71dd2cd37372c47349] [formerly 59deacc8b9e4922059112e6c570dff3aabe8dbde [formerly 60bf37418278254d92ccea71dd2cd37372c47349] [formerly 60bf37418278254d92ccea71dd2cd37372c47349 [formerly 27311c339ff22e9cf89fd7bfdb7e630bb5eaa35d [formerly 5c096dbd7ce0729d9ef65ff96b3355f2d97990e4]]]]]
Former-commit-id: 08a91ad3070bca2e9f43324466cbe01b3d9b687d
Former-commit-id: c3b2bc6e88a3f8e81ca18a9b7659e0b5703c32a9
Former-commit-id: c6e5ccca326d10738c56de5ce65ae9a5d9536ed7 [formerly e4f276ec812afd3ee382e62237bfc8f8fa290856]
Former-commit-id: 161939d7bc01bb12586d6972ad60222a01b95420
Former-commit-id: fbddc91a66278c09c9888dabd684f10385996839
Former-commit-id: e0a98bdf8677a8f00ef346f22c3e0e222620b994
Former-commit-id: 836e1b6a04c4f71fbaa59128f81b2f4e6cf1fa6b
Former-commit-id: 386447c79311ad5c43d5a7b4002888a0107a9ae6
---
 docs/zh/components/container.md                    | 6 +++++-
 src/menu/modules/demo-components.js                | 2 +-
 src/pages/demo/components/container/md/doc-card.md | 4 +---
 src/pages/demo/components/icon/list.vue            | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index 396b6e08..d846ee22 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -1,6 +1,6 @@
 # 页面容器
 
-页面容器组件是每个页面的基础，为了在整个项目中统一效果，它应该是 `<template>` 组件的直接子组件
+页面容器组件是每个页面的基础，为了在整个项目中统一效果，它必须是 `<template>` 组件的直接子组件
 
 ## 参数
 
@@ -13,6 +13,10 @@
 
 一个基础单文件页面组件的示例
 
+::: tip 注意
+为了统一效果，`<template>` 的直接子组件必须是 `<d2-container>`
+:::
+
 ``` vue
 <template>
   <d2-container>
diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js
index 2c35f58f..b323cc62 100644
--- a/src/menu/modules/demo-components.js
+++ b/src/menu/modules/demo-components.js
@@ -9,9 +9,9 @@ export default {
       title: '布局容器',
       icon: 'window-restore',
       children: [
-        { path: `${pre}container/card`, title: '卡片' },
         { path: `${pre}container/full`, title: '填满' },
         { path: `${pre}container/full-bs`, title: '填满 滚动优化' },
+        { path: `${pre}container/card`, title: '卡片' },
         { path: `${pre}container/ghost`, title: '隐形' },
         { path: `${pre}container/ghost-header`, title: '隐形带头部' }
       ]
diff --git a/src/pages/demo/components/container/md/doc-card.md b/src/pages/demo/components/container/md/doc-card.md
index b5bf51e0..2c8d8db0 100644
--- a/src/pages/demo/components/container/md/doc-card.md
+++ b/src/pages/demo/components/container/md/doc-card.md
@@ -1,6 +1,4 @@
-## 基础页面容器
-
-高度根据内容适应
+## 卡片型页面容器
 
 ```
 <d2-container type="card">
diff --git a/src/pages/demo/components/icon/list.vue b/src/pages/demo/components/icon/list.vue
index 0e884db5..df9ed473 100644
--- a/src/pages/demo/components/icon/list.vue
+++ b/src/pages/demo/components/icon/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container type="full" scroll>
+  <d2-container>
     <template slot="header">
       <el-radio-group v-model="showIndex" size="mini">
         <el-radio-button