diff --git a/src/pages/demo/components/editor-simpleMDE/index.vue b/src/pages/demo/components/editor-simpleMDE/index.vue
index e2d02fe8..b0f399fc 100644
--- a/src/pages/demo/components/editor-simpleMDE/index.vue
+++ b/src/pages/demo/components/editor-simpleMDE/index.vue
@@ -1,13 +1,10 @@
 <template>
-  <d2-container type="ghost">
-    <el-card class="d2-mb">
-      <d2-demo-page-header slot="header" title="基本示例"/>
-      <d2-mde
-        v-model="text"
-        class="mde"/>
-    </el-card>
-    <el-card>
-      <template slot="header">输出</template>
+  <d2-container>
+    <d2-demo-page-header slot="header" title="基本示例"/>
+    <d2-mde
+      v-model="text"
+      class="mde"/>
+    <el-card shadow="never">
       <pre>{{text}}</pre>
     </el-card>
   </d2-container>
diff --git a/src/pages/demo/components/highlight/index.vue b/src/pages/demo/components/highlight/index.vue
index 302d2778..737b17cd 100644
--- a/src/pages/demo/components/highlight/index.vue
+++ b/src/pages/demo/components/highlight/index.vue
@@ -1,35 +1,30 @@
 <template>
-  <d2-container type="ghost">
-    <el-card class="d2-mb">
-      <d2-demo-page-header title="代码高亮组件"/>
-    </el-card>
-    <el-card class="d2-mb">
+  <d2-container>
+    <template slot="header">代码高亮组件</template>
+    <el-card shadow="never" class="d2-mb">
       <p slot="title">javascript</p>
       <d2-highlight :code="codeJavascript"/>
     </el-card>
     <el-row :gutter="20">
       <el-col :span="8">
-        <el-card class="d2-mb">
+        <el-card shadow="never">
           <p slot="title">css</p>
           <d2-highlight :code="codeCSS"/>
         </el-card>
       </el-col>
       <el-col :span="8">
-        <el-card class="d2-mb">
+        <el-card shadow="never">
           <p slot="title">scss</p>
           <d2-highlight :code="codeSCSS"/>
         </el-card>
       </el-col>
       <el-col :span="8">
-        <el-card class="d2-mb">
+        <el-card shadow="never">
           <p slot="title">html</p>
           <d2-highlight :code="codeHTML"/>
         </el-card>
       </el-col>
     </el-row>
-    <el-card>
-      <d2-markdown url="/static/md/组件 - 代码高亮.md"/>
-    </el-card>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/components/icon/components/IconCell.vue b/src/pages/demo/components/icon/components/d2-icon-cell.vue
similarity index 100%
rename from src/pages/demo/components/icon/components/IconCell.vue
rename to src/pages/demo/components/icon/components/d2-icon-cell.vue
diff --git a/src/pages/demo/components/icon/icon.vue b/src/pages/demo/components/icon/icon.vue
index e1ed030e..0ce31ce0 100644
--- a/src/pages/demo/components/icon/icon.vue
+++ b/src/pages/demo/components/icon/icon.vue
@@ -1,15 +1,10 @@
 <template>
-  <d2-container type="ghost">
-    <el-card class="d2-mb">
-      <d2-demo-page-header slot="header" title="图标组件"/>
-      <d2-icon/>
-      <d2-icon name="github"/>
-      <d2-icon name="github" style="font-size: 100px;"/>
-      <d2-icon name="github" class="icon-class-demo"/>
-    </el-card>
-    <el-card>
-      <d2-markdown url="/static/md/组件 - 图标组件.md"/>
-    </el-card>
+  <d2-container>
+    <template slot="header">图标组件</template>
+    <d2-icon/>
+    <d2-icon name="github"/>
+    <d2-icon name="github" style="font-size: 100px;"/>
+    <d2-icon name="github" class="icon-class-demo"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/components/icon/list.vue b/src/pages/demo/components/icon/list.vue
index e691999c..e0ffcbaa 100644
--- a/src/pages/demo/components/icon/list.vue
+++ b/src/pages/demo/components/icon/list.vue
@@ -1,28 +1,21 @@
 <template>
-  <d2-container type="ghost">
-    <el-card>
-      <template slot="header">
-        <el-radio-group v-model="showIndex" size="mini">
-          <el-radio-button
-            v-for="(item, index) in radioOptions"
-            :key="index"
-            :label="item.value">
-            {{item.label}}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <el-row style="margin: -10px;">
-        <el-alert
-          title="点击图标复制代码"
-          type="info"
-          class="d2-m-10"
-          style="width: auto;">
-        </el-alert>
-        <el-col v-for="(iconItem, iconIndex) in iconShow.icon" :key="iconIndex" :span="6" class="d2-p-10">
-          <d2-iconCell :icon="iconItem"></d2-iconCell>
-        </el-col>
-      </el-row>
-    </el-card>
+  <d2-container>
+    <template slot="header">
+      <el-radio-group v-model="showIndex" size="mini">
+        <el-radio-button
+          v-for="(item, index) in radioOptions"
+          :key="index"
+          :label="item.value">
+          {{item.label}}
+        </el-radio-button>
+      </el-radio-group>
+    </template>
+    <el-row style="margin: -10px;">
+      <el-alert title="点击图标复制代码" type="info" class="d2-m-10" style="width: auto;"/>
+      <el-col v-for="(iconItem, iconIndex) in iconShow.icon" :key="iconIndex" :span="6" class="d2-p-10">
+        <d2-icon-cell :icon="iconItem"/>
+      </el-col>
+    </el-row>
   </d2-container>
 </template>
 
@@ -30,7 +23,7 @@
 import icon from '@/assets/library/font-awesome-4.7.0-icon/icon.js'
 export default {
   components: {
-    IconCell: () => import('./components/IconCell')
+    'd2-icon-cell': () => import('./components/d2-icon-cell')
   },
   data () {
     return {
diff --git a/src/pages/demo/components/icon/select.vue b/src/pages/demo/components/icon/select.vue
index 2ad209e8..9e5c2721 100644
--- a/src/pages/demo/components/icon/select.vue
+++ b/src/pages/demo/components/icon/select.vue
@@ -1,33 +1,28 @@
 <template>
-  <d2-container type="ghost">
-    <el-card class="d2-mb">
-      <d2-demo-page-header slot="header" title="图标选择器"/>
-      <div class="title-group">
-        <p class="title">一般用法</p>
-        <p class="sub-title">
-          <template v-if="icon">
-            选择的图标 {{icon}}
-            <i :class="'fa fa-' + icon"></i>
-          </template>
-          <template v-else>未选择</template>
-        </p>
-      </div>
-      <d2-icon-select v-model="icon"/>
-      <div class="title-group">
-        <p class="title">用户可以输入</p>
-        <p class="sub-title">
-          <template v-if="icon2">
-            选择的图标 {{icon2}}
-            <i :class="'fa fa-' + icon2"></i>
-          </template>
-          <template v-else>未选择</template>
-        </p>
-      </div>
-      <d2-icon-select v-model="icon2" :user-input="true"/>
-    </el-card>
-    <el-card>
-      <d2-markdown url="/static/md/组件 - 图标选择器.md"/>
-    </el-card>
+  <d2-container>
+    <template slot="header">图标选择器</template>
+    <div class="title-group">
+      <p class="title">一般用法</p>
+      <p class="sub-title">
+        <template v-if="icon">
+          选择的图标 {{icon}}
+          <i :class="'fa fa-' + icon"></i>
+        </template>
+        <template v-else>未选择</template>
+      </p>
+    </div>
+    <d2-icon-select v-model="icon"/>
+    <div class="title-group">
+      <p class="title">用户可以输入</p>
+      <p class="sub-title">
+        <template v-if="icon2">
+          选择的图标 {{icon2}}
+          <i :class="'fa fa-' + icon2"></i>
+        </template>
+        <template v-else>未选择</template>
+      </p>
+    </div>
+    <d2-icon-select v-model="icon2" :user-input="true"/>
   </d2-container>
 </template>
 
diff --git a/src/pages/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue
index 280186e5..321741fa 100644
--- a/src/pages/demo/components/icon/svg.vue
+++ b/src/pages/demo/components/icon/svg.vue
@@ -1,19 +1,14 @@
 <template>
-  <d2-container type="ghost">
-    <el-card class="d2-mb">
-      <d2-demo-page-header slot="header" title="SVG图标组件"/>
-      <el-row>
-        <el-col class="icon-card" :span="4" v-for="(icon, index) in $IconSvg" :key="index">
-          <d2-icon-svg class="icon" :name="icon"/>
-          <div class="icon-title">
-            <span>{{icon}}</span>
-          </div>
-        </el-col>
-      </el-row>
-    </el-card>
-    <el-card>
-      <d2-markdown url="/static/md/组件 - 图标组件 - svg.md"/>
-    </el-card>
+  <d2-container>
+    <template slot="header">SVG图标组件</template>
+    <el-row>
+      <el-col class="icon-card" :span="4" v-for="(icon, index) in $IconSvg" :key="index">
+        <d2-icon-svg class="icon" :name="icon"/>
+        <div class="icon-title">
+          <span>{{icon}}</span>
+        </div>
+      </el-col>
+    </el-row>
   </d2-container>
 </template>