diff --git a/README.md b/README.md
index 81a93c082..17f18cefb 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ Modern browsers and Android 4.0+, iOS 6+.
 - [Change log](https://www.youzanyun.com/zanui/vant#/en-US/component/changelog)
 - [React UI Zent](https://www.youzanyun.com/zanui/zent)
 - [vue-cli-template-vant](https://github.com/youzan/vue-cli-template-vant) 
-- [vant-demo](https://github.com/chenjiahan/vant-demo)
+- [vant-demo](https://github.com/youzan/vant-demo)
  
 ## Preview
 You can scan the following QR code to access the demo：
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 8a8a31566..c1781dda6 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -104,7 +104,7 @@ Vue.use(Vant);
 - [更新日志](https://www.youzanyun.com/zanui/vant#/en-US/component/changelog)
 - [React 组件库 Zent](https://www.youzanyun.com/zanui/zent)
 - [vue-cli-template-vant](https://github.com/youzan/vue-cli-template-vant) 
-- [vant-demo](https://github.com/chenjiahan/vant-demo)
+- [vant-demo](https://github.com/youzan/vant-demo)
  
 ## 开源协议
 
diff --git a/docs/markdown/en-US/theme.md b/docs/markdown/en-US/theme.md
index 5ec97e586..e66ced2d9 100644
--- a/docs/markdown/en-US/theme.md
+++ b/docs/markdown/en-US/theme.md
@@ -1,6 +1,6 @@
 ## Custom Theme (In translation)
 
-`Vant`提供了一套默认主题，CSS 命名采用 BEM 的风格，方便使用者覆盖样式。如果你想完全替换主题色或者其他样式，可以使用下面的方法：
+`Vant` provides a set of default themes, if you want to custom the theme color or other styles, you can use the following methods:
 
 ### 方案一. PostCSS 插件
 在项目中直接引入组件对应的 postcss 源代码，并通过 postcss 插件 [postcss-theme-variables](https://www.npmjs.com/package/postcss-theme-variables) 替换颜色变量，步骤如下：
diff --git a/docs/src/components/demo-list.vue b/docs/src/components/DemoList.vue
similarity index 96%
rename from docs/src/components/demo-list.vue
rename to docs/src/components/DemoList.vue
index de24ab538..5fe6be82a 100644
--- a/docs/src/components/demo-list.vue
+++ b/docs/src/components/DemoList.vue
@@ -15,7 +15,7 @@
 
 <script>
 import docConfig from '../doc.config';
-import MobileNav from './mobile-nav';
+import MobileNav from './MobileNav';
 
 export default {
   data() {
@@ -44,7 +44,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="postcss">
 .side-nav {
   width: 100%;
   box-sizing: border-box;
diff --git a/docs/src/components/DemoPages.vue b/docs/src/components/DemoPages.vue
new file mode 100644
index 000000000..89f0ca2bb
--- /dev/null
+++ b/docs/src/components/DemoPages.vue
@@ -0,0 +1,101 @@
+<template>
+  <section class="van-doc-demo-pages">
+    <h2>示例</h2>
+    <p>下面是一些使用 Vant 搭建的示例页面，点击图片切换至对应示例。</p>
+    <div class="van-doc-demo-pages__gallery">
+      <div
+        :class="['van-doc-demo-pages__item', { 'van-doc-demo-pages__item--active': index === currentDemo }]"
+        v-for="(demo, index) in demos"
+      >
+        <h4>{{ demo.title }}</h4>
+        <a :href="demo.source" target="_blank">源代码</a>
+        <img :src="demo.preview" @click="onChangeDemo(demo, index)" />
+      </div>
+    </div>
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'van-doc-demo-pages',
+
+  data() {
+    return {
+      currentDemo: 0,
+      demos: [{
+        title: '商品详情',
+        preview: 'https://img.yzcdn.cn/public_files/2017/10/24/7070a8d1d6504b864c605114d32f2aae.png',
+        url: 'https://youzan.github.io/vant-demo/#/goods',
+        source: 'https://github.com/youzan/vant-demo/tree/master/src/view/goods/index.vue'
+      }, {
+        title: '会员中心',
+        preview: 'https://img.yzcdn.cn/public_files/2017/10/23/e1d70757e3ab88d39a360b704be8f43f.png',
+        url: 'https://youzan.github.io/vant-demo/#/user',
+        source: 'https://github.com/youzan/vant-demo/tree/master/src/view/user/index.vue'
+      }, {
+        title: '购物车',
+        preview: 'https://img.yzcdn.cn/public_files/2017/10/24/06b8b5ed3692314d434db7f6854dcdbe.png',
+        url: 'https://youzan.github.io/vant-demo/#/cart',
+        source: 'https://github.com/youzan/vant-demo/tree/master/src/view/cart/index.vue'
+      }]
+    };
+  },
+
+  beforeMount() {
+    this.$emit('changeDemoURL', this.demos[0].url);
+  },
+
+  methods: {
+    onChangeDemo(demo, index) {
+      this.currentDemo = index;
+      this.$emit('changeDemoURL', demo.url);
+    }
+  }
+};
+</script>
+
+<style lang="postcss">
+.van-doc-demo-pages {
+  &__gallery {
+    margin-top: 30px;
+  }
+
+  &__item {
+    width: 28%;
+    text-align: center;
+    margin-bottom: 40px;
+    display: inline-block;
+
+    &:nth-child(3n+1),
+    &:nth-child(3n+2) {
+      margin-right: 4%;
+    }
+
+    h4 {
+      font-size: 14px;
+      line-height: 20px;
+      font-weight: normal;
+    }
+
+    img {
+      width: 100%;
+      cursor: pointer;
+      border-radius: 3px;
+      background-color: #f8f8f8;
+      box-shadow: 0 2px 3px rgba(10, 10, 10, 0.1), 0 0 0 1px rgba(10, 10, 10, 0.1);
+    }
+
+    a {
+      font-size: 12px;
+      margin: 4px 0 7px;
+      display: inline-block;
+    }
+
+    &--active {
+      img {
+        box-shadow: 0 1px 4px rgba(51, 136, 255, .4), 0 0 0 1px rgba(51, 136, 255, .4);
+      }
+    }
+  }
+}
+</style>
diff --git a/docs/src/components/mobile-nav.vue b/docs/src/components/MobileNav.vue
similarity index 100%
rename from docs/src/components/mobile-nav.vue
rename to docs/src/components/MobileNav.vue
diff --git a/docs/src/router.config.js b/docs/src/router.config.js
index c9b409fe6..feadf84af 100644
--- a/docs/src/router.config.js
+++ b/docs/src/router.config.js
@@ -1,8 +1,8 @@
 import docConfig from './doc.config';
-import DemoList from './components/demo-list';
+import DemoList from './components/DemoList';
 import componentDocs from '../markdown';
 import componentDemos from '../demos';
-import { Demos } from 'vant-doc';
+import DemoPages from './components/DemoPages';
 import Vue from 'vue';
 import './utils/iframe-router';
 
@@ -50,7 +50,7 @@ const registerRoute = (isExample) => {
         let component;
 
         if (path === '/demo') {
-          component = Demos;
+          component = DemoPages;
         } else {
           component = isExample ? componentDemos[path.replace('/', '')] : componentDocs[name];
         }
diff --git a/package.json b/package.json
index 6bf9b3a5f..81e4253f3 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "style-loader": "^0.19.0",
     "uppercamelcase": "^3.0.0",
     "url-loader": "^0.6.2",
-    "vant-doc": "0.3.16",
+    "vant-doc": "0.3.17",
     "vue": "^2.5.3",
     "vue-loader": "^13.5.0",
     "vue-markdown-loader": "^2.2.3",
diff --git a/yarn.lock b/yarn.lock
index 792a934c8..a784a9a5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7755,9 +7755,9 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-vant-doc@0.3.16:
-  version "0.3.16"
-  resolved "https://registry.yarnpkg.com/vant-doc/-/vant-doc-0.3.16.tgz#0efffba8173eeb46cc5ec15b4539646d656d63b7"
+vant-doc@0.3.17:
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/vant-doc/-/vant-doc-0.3.17.tgz#4c3bd5e4a4299926ad3638dc1c1bd28bbb5ac34b"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"