diff --git a/docs/examples-docs/sku.md b/docs/examples-docs/sku.md
index e01db13ab..2eee8971f 100644
--- a/docs/examples-docs/sku.md
+++ b/docs/examples-docs/sku.md
@@ -16,6 +16,8 @@ export default {
goodsId: data.goods_id,
quota: data.quota,
quotaUsed: data.quota_used,
+ disableStepperInput: true,
+ resetStepperOnHide: true,
initialSku: {
s1: '30349',
s2: '1193'
@@ -62,10 +64,10 @@ Vue.component(Sku.name, Sku);
:goods="goods"
:goods-id="goodsId"
:hide-stock="sku.hide_stock"
- :show-add-cart-btn="true"
:quota="quota"
:quota-used="quotaUsed"
- :reset-stepper-on-hide="true"
+ :reset-stepper-on-hide="resetStepperOnHide"
+ :disable-stepper-input="disableStepperInput"
@buy-clicked="handleBuyClicked"
@add-cart="handleAddCartClicked"
>
@@ -130,6 +132,7 @@ Vue.component(Sku.name, Sku);
| quota | 限购数(0表示不限购) | Number | 0 | 否 |
| quotaUsed | 已经购买过的数量 | Number | 0 | 否 |
| resetStepperOnHide | 窗口隐藏时重置选择的商品数量 | Boolean | false | 否 |
+| disableStepperInput | 是否禁用sku中stepper的input框 | Boolean | false | 否 |
| stepperTitle | 数量选择组件左侧文案 | String | '购买数量' | 否 |
| add-cart | 点击添加购物车回调 | Function(skuData: Object) | - | 否 |
| buy-clicked | 点击购买回调 | Function(skuData: Object) | - | 否 |
diff --git a/docs/examples-docs/stepper.md b/docs/examples-docs/stepper.md
index ce48e7804..19cee1d97 100644
--- a/docs/examples-docs/stepper.md
+++ b/docs/examples-docs/stepper.md
@@ -69,7 +69,8 @@ Vue.component(Stepper.name, Stepper);
| max | 最大值 | `String | Number` | - | - |
| defaultValue | 默认值 | `String | Number` | `1` | - |
| step | 步数 | `String | Number` | `1` | - |
-| disabled | 是否禁用 | `Boolean` | `false` | - |
+| disabled | 是否禁用 | `Boolean` | `false` | - |
+| disableInput | 是否禁用input框 | `Boolean` | `false` | - |
### Event
diff --git a/docs/examples-docs/waterfall.md b/docs/examples-docs/waterfall.md
index 268b02449..00c2e406b 100644
--- a/docs/examples-docs/waterfall.md
+++ b/docs/examples-docs/waterfall.md
@@ -15,7 +15,7 @@ Waterfall.install(Vue);
#### 局部注册
-如果你只是想在某个组件中使用`Waterfall`,你可以在对应组件中注册`Waterfall`指令,这样只能在你注册的组件中使用`Waterfall`:
+如果你只是想在某个组件中使用`Waterfall`,可以在对应组件中注册`Waterfall`指令,这样只能在你注册的组件中使用`Waterfall`:
```js
import { Waterfall } from 'vant';
@@ -34,7 +34,7 @@ export default {
export default {
data() {
return {
- list: [1, 2, 3, 4, 5],
+ list: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
loading: false,
finished: false
};
@@ -54,7 +54,7 @@ export default {
this.list.push(lastNumber);
}
this.loading = false;
- }, 2000);
+ }, 200);
}
},
computed: {
@@ -67,15 +67,16 @@ export default {
#### 基础用法
-
+使用 `v-waterfall-lower` 监听滚动到达底部,并执行相应函数。若是函数执行中需要异步加载数据,可以将 `waterfall-disabled` 指定的值置为 false,禁止 `v-waterfall-lower` 监听滚动事件
:::demo 基础用法
```html
当即将滚动到元素底部时,会自动加载更多
-
+
```
:::
diff --git a/package.json b/package.json
index ff5139429..75bb24762 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vant",
- "version": "0.9.8",
+ "version": "0.9.9",
"description": "有赞vue wap组件库",
"main": "lib/vant.js",
"style": "lib/vant-css/index.css",
diff --git a/packages/index.js b/packages/index.js
index cf0a17e6f..d0e94fa22 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -54,7 +54,7 @@ import TreeSelect from './tree-select';
import Uploader from './uploader';
import Waterfall from './waterfall';
-const version = '0.9.8';
+const version = '0.9.9';
const components = [
Actionsheet,
AddressEdit,
diff --git a/packages/sku/components/SkuStepper.vue b/packages/sku/components/SkuStepper.vue
index 892c235f9..c15be326f 100644
--- a/packages/sku/components/SkuStepper.vue
+++ b/packages/sku/components/SkuStepper.vue
@@ -2,7 +2,14 @@
{{ stepperTitle }}:
-
+
+
剩余{{ stock }}件
每人限购{{ quota }}件
@@ -34,6 +41,10 @@ export default {
type: Boolean,
default: false
},
+ disableStepperInput: {
+ type: Boolean,
+ default: false
+ },
stepperTitle: {
type: String,
default: DEFAULT_BUY_TEXT
diff --git a/packages/sku/containers/SkuContainer.vue b/packages/sku/containers/SkuContainer.vue
index 2d36faa0a..b79a0c3f2 100644
--- a/packages/sku/containers/SkuContainer.vue
+++ b/packages/sku/containers/SkuContainer.vue
@@ -45,6 +45,7 @@
:skuStockNum="sku.stock_num"
:quota="quota"
:quotaUsed="quotaUsed"
+ :disableStepperInput="disableStepperInput"
:hideStock="hideStock">
@@ -133,6 +134,7 @@ export default {
default: 200
},
resetStepperOnHide: Boolean,
+ disableStepperInput: Boolean,
messagePlaceholderMap: {
type: Object,
default() {
diff --git a/packages/stepper/index.vue b/packages/stepper/index.vue
index adc61b2e4..cf8bb9a78 100644
--- a/packages/stepper/index.vue
+++ b/packages/stepper/index.vue
@@ -8,11 +8,11 @@
}">
+ :disabled="disabled || disableInput">