From 7a3963983e15c936c71edb4d2f56d8fbfbdb0c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Sat, 24 Feb 2018 20:26:55 +0800
Subject: [PATCH] no message

Former-commit-id: b94bf1e3e3cba10be166f2ec381224e19e2b6aed
Former-commit-id: 6ea5bf9eca782bb1de02375d965be1120829d2c9
Former-commit-id: 0094e36fbc04bc8bf80eda85f573470dd55cd64d
---
 src/pages/demo/components/markdown/demo.vue      |  7 ++++++-
 src/pages/demo/components/markdown/doc.vue       |  9 +++++++++
 src/router/menu/_components.js                   |  2 +-
 .../article/组件 - markdown - 文档.md            | 16 ++++++++++++++++
 ...件 - markdown.md => 组件 - markdown - 演示.md} |  0
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/components/markdown/doc.vue
 create mode 100644 static/markdownFiles/article/组件 - markdown - 文档.md
 rename static/markdownFiles/article/{组件 - markdown.md => 组件 - markdown - 演示.md} (100%)

diff --git a/src/pages/demo/components/markdown/demo.vue b/src/pages/demo/components/markdown/demo.vue
index d4870d87..b33b82ea 100644
--- a/src/pages/demo/components/markdown/demo.vue
+++ b/src/pages/demo/components/markdown/demo.vue
@@ -1,5 +1,10 @@
 <template>
   <Container>
-    <markdown url="/static/markdownFiles/article/组件 - markdown.md"></markdown>
+    <PageHeader
+      slot="header"
+      title="效果演示"
+      url="https://github.com/FairyEver/d2admin-vue-element/blob/master/src/components/core/Markdown/index.vue">
+    </PageHeader>
+    <markdown url="/static/markdownFiles/article/组件 - markdown - 演示.md"></markdown>
   </Container>
 </template>
\ No newline at end of file
diff --git a/src/pages/demo/components/markdown/doc.vue b/src/pages/demo/components/markdown/doc.vue
new file mode 100644
index 00000000..f5526b24
--- /dev/null
+++ b/src/pages/demo/components/markdown/doc.vue
@@ -0,0 +1,9 @@
+<template>
+  <Container>
+    <PageHeader
+      slot="header"
+      title="文档">
+    </PageHeader>
+    <markdown url="/static/markdownFiles/article/组件 - markdown - 文档.md"></markdown>
+  </Container>
+</template>
\ No newline at end of file
diff --git a/src/router/menu/_components.js b/src/router/menu/_components.js
index ba80eae2..d8118a08 100644
--- a/src/router/menu/_components.js
+++ b/src/router/menu/_components.js
@@ -91,7 +91,7 @@ export const menu = {
       icon: 'font',
       children: [
         {
-          title: '基本示例',
+          title: '效果演示',
           icon: 'file-o',
           path: 'marked/demo',
           name: 'demo-components-markdown-demo',
diff --git a/static/markdownFiles/article/组件 - markdown - 文档.md b/static/markdownFiles/article/组件 - markdown - 文档.md
new file mode 100644
index 00000000..b9d2f12b
--- /dev/null
+++ b/static/markdownFiles/article/组件 - markdown - 文档.md	
@@ -0,0 +1,16 @@
+## 参数
+
+| 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 |
+| --- | --- | --- | --- | --- | --- |
+| url | markdown文件地址 | 非 | String |  | 无 |
+| md | markdown内容 | 非 | String |  | 无 |
+| highlight | 代码高亮 | 非 | Boolean |  | false |
+| baidupan | 百度网盘分享链接显示优化 | 非 | Boolean |  | true |
+
+## 使用方法
+
+加载一个.md文件
+
+```
+<markdown url="/static/markdownFiles/article/组件 - markdown - 演示.md"></markdown>
+```
\ No newline at end of file
diff --git a/static/markdownFiles/article/组件 - markdown.md b/static/markdownFiles/article/组件 - markdown - 演示.md
similarity index 100%
rename from static/markdownFiles/article/组件 - markdown.md
rename to static/markdownFiles/article/组件 - markdown - 演示.md