From 276042b84cddc72a6d3007ee78e4ba3b85181f9f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 24 Oct 2017 21:06:53 -0500
Subject: [PATCH] [Doc] add goods demo (#242)

* [bugfix] Checkbox border render error in weixin browser

* [bugfix] TreeSelect dependency path error

* [bugfix] Swipe should clear autoplay timer when destroyed

* [bugfix] Optimize component dependency analyze when build style entry

* merge

* update yarn.lock

* update README.md

* update README.md

* update README.md

* update README.md

* update README.md

* [Doc] add more badges in README.md

* update README.md

* [bugfix] Address & Contact list style

* fix: contact test cases

* [bugfix] popup style missing when build style entry

* [bugfix] Search: onSearch event arguments missing

* [Doc] add demo pages

* update zan-doc@0.3.7

* fix: build entry error

* [Doc] add goods demo

* [bugfix] button primary background color
---
 docs/examples-docs/en-US/cell.md        |  2 +-
 docs/examples-docs/en-US/tree-select.md |  1 -
 docs/examples-docs/zh-CN/cell.md        |  2 +-
 docs/src/components/demo.vue            | 11 ++++++++---
 packages/cell/index.vue                 |  2 +-
 packages/vant-css/src/common/var.css    |  8 +++-----
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/docs/examples-docs/en-US/cell.md b/docs/examples-docs/en-US/cell.md
index 9253028a9..d18eca59a 100644
--- a/docs/examples-docs/en-US/cell.md
+++ b/docs/examples-docs/en-US/cell.md
@@ -67,7 +67,7 @@ Vue.component(CellGroup.name, CellGroup);
 :::demo Advanced Usage
 ```html
 <van-cell-group>
-  <van-cell value="Text" icon="home" is-link>
+  <van-cell value="Text" icon="shop" is-link>
     <template slot="title">
       <span class="van-cell-text">Title</span>
       <van-tag type="danger">Tag</van-tag>
diff --git a/docs/examples-docs/en-US/tree-select.md b/docs/examples-docs/en-US/tree-select.md
index 6d9c92503..7bf53824c 100644
--- a/docs/examples-docs/en-US/tree-select.md
+++ b/docs/examples-docs/en-US/tree-select.md
@@ -139,7 +139,6 @@ export default {
 | itemclick | triggered when item is selected | data: selected item |
 
 ### Data Structure
-
 `items` should be an array contains specified tree objects.
 
 In every tree object, `text` property defines the name, `id` stands for the unique key while the `children` contains sub-tree objects.
diff --git a/docs/examples-docs/zh-CN/cell.md b/docs/examples-docs/zh-CN/cell.md
index 158ae8df9..12d52eee3 100644
--- a/docs/examples-docs/zh-CN/cell.md
+++ b/docs/examples-docs/zh-CN/cell.md
@@ -87,7 +87,7 @@ Vue.component(CellGroup.name, CellGroup);
 :::demo 高级用法
 ```html
 <van-cell-group>
-  <van-cell value="进入店铺" icon="home" is-link>
+  <van-cell value="进入店铺" icon="shop" is-link>
     <template slot="title">
       <span class="van-cell-text">起码运动馆</span>
       <van-tag type="danger">官方</van-tag>
diff --git a/docs/src/components/demo.vue b/docs/src/components/demo.vue
index 46b120468..ac4b101c9 100644
--- a/docs/src/components/demo.vue
+++ b/docs/src/components/demo.vue
@@ -21,15 +21,20 @@ export default {
     return {
       currentDemo: 0,
       demos: [{
+        title: '商品详情',
+        preview: 'https://img.yzcdn.cn/public_files/2017/10/24/7070a8d1d6504b864c605114d32f2aae.png',
+        url: 'https://chenjiahan.github.io/vant-demo/#/goods',
+        source: 'https://github.com/chenjiahan/vant-demo/tree/master/src/view/goods/index.vue'
+      }, {
         title: '会员中心',
         preview: 'https://img.yzcdn.cn/public_files/2017/10/23/e1d70757e3ab88d39a360b704be8f43f.png',
         url: 'https://chenjiahan.github.io/vant-demo/#/user',
-        source: 'https://github.com/chenjiahan/vant-demo/tree/master/src/view/user'
+        source: 'https://github.com/chenjiahan/vant-demo/tree/master/src/view/user/index.vue'
       }, {
         title: '购物车',
         preview: 'https://img.yzcdn.cn/public_files/2017/10/24/06b8b5ed3692314d434db7f6854dcdbe.png',
         url: 'https://chenjiahan.github.io/vant-demo/#/cart',
-        source: 'https://github.com/chenjiahan/vant-demo/tree/master/src/view/cart'
+        source: 'https://github.com/chenjiahan/vant-demo/tree/master/src/view/cart/index.vue'
       }]
     };
   },
@@ -79,9 +84,9 @@ export default {
     }
 
     a {
-      display: block;
       font-size: 12px;
       margin: 4px 0 7px;
+      display: inline-block;
     }
 
     &--active {
diff --git a/packages/cell/index.vue b/packages/cell/index.vue
index bd090512d..ca980f762 100644
--- a/packages/cell/index.vue
+++ b/packages/cell/index.vue
@@ -2,7 +2,7 @@
   <a :class="['van-cell', 'van-hairline', { 'van-cell--required': required }]" :href="url" @click="$emit('click')">
     <div class="van-cell__title" v-if="$slots.title || title">
       <slot name="icon">
-        <i v-if="icon" class="van-icon" :class="'van-icon-' + icon" />
+        <van-icon v-if="icon" :name="icon" />
       </slot>
       <slot name="title">
         <span class="van-cell__text" v-text="title" />
diff --git a/packages/vant-css/src/common/var.css b/packages/vant-css/src/common/var.css
index fe99eb4a0..24597a71f 100644
--- a/packages/vant-css/src/common/var.css
+++ b/packages/vant-css/src/common/var.css
@@ -2,15 +2,13 @@
 $black: #000;
 $white: #fff;
 $red: #f44;
+$blue: #38f;
+$orange: #f60;
 $green: #06bf04;
-$green-wx: #4b0;
 $gray: #c9c9c9;
 $gray-light: #e5e5e5;
 $gray-darker: #666;
 $gray-dark: #999;
-$yellow: #f09000;
-$orange: #f60;
-$blue: #38f;
 
 /* default colors */
 $text-color: #333;
@@ -20,7 +18,7 @@ $background-color: #f8f8f8;
 
 /* button */
 $button-primary-color: $white;
-$button-primary-background-color: $green-wx;
+$button-primary-background-color: #4b0;
 $button-primary-border-color: #0a0;
 $button-default-color: $text-color;
 $button-default-background-color: $white;