Merge remote-tracking branch 'main/dev' into dev

docs/examples-docs/changelog.md

@@ -1,5 +1,38 @@
 ## 更新日志
 
+## [v0.8.8](https://github.com/youzan/vant/tree/v0.8.8) (2017-09-01)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.8.7...v0.8.8)
+
+**非兼容更新和新特性:**
+
+- Checkbox: support listen to change event [\#104](https://github.com/youzan/vant/pull/104) ([chenjiahan](https://github.com/chenjiahan))
+- add GoodsAction component [\#102](https://github.com/youzan/vant/pull/102) ([chenjiahan](https://github.com/chenjiahan))
+- add InvalidGoods component [\#100](https://github.com/youzan/vant/pull/100) ([chenjiahan](https://github.com/chenjiahan))
+- add OrderGoods component [\#99](https://github.com/youzan/vant/pull/99) ([chenjiahan](https://github.com/chenjiahan))
+- add PayOrder component [\#98](https://github.com/youzan/vant/pull/98) ([chenjiahan](https://github.com/chenjiahan))
+
+**修复:**
+
+- 修复 make init bug [\#97](https://github.com/youzan/vant/pull/97) ([pangxie1991](https://github.com/pangxie1991))
+
+**合并的 Pull Request (可能有不兼容改动):**
+
+- PayOrder component add tip slot [\#105](https://github.com/youzan/vant/pull/105) ([Raistlin916](https://github.com/Raistlin916))
+- Add deep-select component and fix a popup bug. [\#103](https://github.com/youzan/vant/pull/103) ([Tinysymphony](https://github.com/Tinysymphony))
+- Doc: update Step/Loading/Tag/Badge documents [\#101](https://github.com/youzan/vant/pull/101) ([chenjiahan](https://github.com/chenjiahan))
+
+## [v0.8.7](https://github.com/youzan/vant/tree/v0.8.7) (2017-08-29)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.8.6...v0.8.7)
+
+**非兼容更新和新特性:**
+
+- add ExpressWay component [\#96](https://github.com/youzan/vant/pull/96) ([chenjiahan](https://github.com/chenjiahan))
+- add CellSwitch component [\#95](https://github.com/youzan/vant/pull/95) ([chenjiahan](https://github.com/chenjiahan))
+- add NoticeBar && test cases [\#94](https://github.com/youzan/vant/pull/94) ([chenjiahan](https://github.com/chenjiahan))
+- Dialog: support both function call and component call [\#93](https://github.com/youzan/vant/pull/93) ([chenjiahan](https://github.com/chenjiahan))
+- CellSwipe: improve test coverage && code review [\#91](https://github.com/youzan/vant/pull/91) ([chenjiahan](https://github.com/chenjiahan))
+- Progress: adjust DOM struct [\#90](https://github.com/youzan/vant/pull/90) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v0.8.6](https://github.com/youzan/vant/tree/v0.8.6) (2017-08-24)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.8.5...v0.8.6)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.8.7",
+  "version": "0.8.9",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

packages/index.js

@@ -49,7 +49,7 @@ import Toast from './toast';
 import Uploader from './uploader';
 import Waterfall from './waterfall';
 
-const version = '0.8.7';
+const version = '0.8.9';
 const components = [
   Actionsheet,
   Badge,

packages/swipe/index.vue

@@ -3,7 +3,10 @@
     <div class="van-swipe__items">
       <slot></slot>
     </div>
-    <div class="van-swipe__indicators" v-if="showIndicators">
+    <div
+      class="van-swipe__indicators"
+      v-if="showIndicators && swipes.length > 1"
+    >
       <span class="van-swipe__indicator" v-for="(item, index) in swipes.length" :key="index" :class="{
         'van-swipe__indicator--active': currIndex === index
       }">

packages/vant-css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.8.7",
+  "version": "0.8.9",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

packages/vant-css/src/deep-select.css

@@ -1,10 +1,12 @@
-@import "./mixins/ellipsis";
-@import "./mixins/clearfix";
+@import "./mixins/ellipsis.css";
+@import "./mixins/clearfix.css";
 @import './common/var.css';
+
 .van-deep-select {
   user-select: none;
   position: relative;
   @mixin clearfix;
+
   &__nav {
     width: 143px;
     /*float: left;*/
@@ -16,31 +18,37 @@
     background-color: $c-white;
     -webkit-overflow-scrolling: touch;
   }
+
   &__nitem {
     line-height: 44px;
     padding: 0 15px;
     background-color: $c-white;
     @mixin multi-ellipsis 1;
+
     &--active {
       background-color: $c-background;
     }
   }
+
   &__content {
     padding: 0 15px;
     margin-left: 143px;
     overflow: scroll;
     -webkit-overflow-scrolling: touch;
   }
+  
   &__item {
     position: relative;
     line-height: 44px;
     padding-left: 5px;
     padding-right: 18px;
     @mixin multi-ellipsis 1;
+    
     &--active {
       color: $button-danger-background-color;
     }
   }
+
   &__selected {
     float: right;
     position: absolute;

packages/vant-css/src/goods-action.css

@@ -1,4 +1,5 @@
 @import './common/var.css';
+@import './mixins/border_retina.css';
 
 .van-goods-action {
   left: 0;