From 38f5ef88f552d20c39910d0c5db8a40edd0f68f4 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Sun, 24 Sep 2017 11:41:10 +0800
Subject: [PATCH 1/7] fix: sku message key

---
 packages/sku/components/SkuMessages.vue  | 7 ++++---
 packages/sku/containers/SkuContainer.vue | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue
index 66ef71905..171bf2dc3 100644
--- a/packages/sku/components/SkuMessages.vue
+++ b/packages/sku/components/SkuMessages.vue
@@ -3,7 +3,7 @@
     <template v-for="(message, index) in internalMessages">
       <template v-if="message.type === 'image'"></template>
       <van-field v-else-if="message.multiple == '1'"
-        :key="index"
+        :key="collectionId + '-' + index"
         :required="message.required == '1'"
         :label="message.name"
         :placeholder="placeholderMap.textarea"
@@ -11,7 +11,7 @@
         v-model="messageValues[index]">
       </van-field>
       <van-field v-else
-        :key="index"
+        :key="collectionId + '-' + index"
         :required="message.required == '1'"
         :label="message.name"
         :placeholder="placeholderMap[message.type]"
@@ -39,7 +39,8 @@ export default {
 
   props: {
     messages: Array,
-    messagePlaceholderMap: Object
+    messagePlaceholderMap: Object,
+    collectionId: Number
   },
 
   data() {
diff --git a/packages/sku/containers/SkuContainer.vue b/packages/sku/containers/SkuContainer.vue
index e74736eeb..59a29a4bb 100644
--- a/packages/sku/containers/SkuContainer.vue
+++ b/packages/sku/containers/SkuContainer.vue
@@ -51,6 +51,7 @@
          <slot name="sku-messages">
             <van-sku-messages
               ref="skuMessages"
+              :collectionId="sku.collection_id"
               :messagePlaceholderMap="messagePlaceholderMap"
               :messages="sku.messages">
             </van-sku-messages>

From 2f6e31488db96db260301ddbbdc146d048a56b08 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Sun, 24 Sep 2017 12:56:08 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E6=94=B9=E7=94=A8goods=5Fid?=
 =?UTF-8?q?=E5=BD=93key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/examples-docs/sku.md                | 4 ++++
 packages/sku/components/SkuMessages.vue  | 6 +++---
 packages/sku/containers/SkuContainer.vue | 4 +++-
 test/unit/specs/sku.spec.js              | 6 ++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/examples-docs/sku.md b/docs/examples-docs/sku.md
index 080606e11..e01db13ab 100644
--- a/docs/examples-docs/sku.md
+++ b/docs/examples-docs/sku.md
@@ -13,6 +13,7 @@ export default {
       showCustomAction: false,
       sku: data.sku,
       goods: goods,
+      goodsId: data.goods_id,
       quota: data.quota,
       quotaUsed: data.quota_used,
       initialSku: {
@@ -59,6 +60,7 @@ Vue.component(Sku.name, Sku);
       v-model="showBase"
       :sku="sku"
       :goods="goods"
+      :goods-id="goodsId"
       :hide-stock="sku.hide_stock"
       :show-add-cart-btn="true"
       :quota="quota"
@@ -84,6 +86,7 @@ Vue.component(Sku.name, Sku);
       stepper-title="我要买"
       :sku="sku"
       :goods="goods"
+      :goods-id="goodsId"
       :hide-stock="sku.hide_stock"
       :show-add-cart-btn="true"
       :quota="quota"
@@ -121,6 +124,7 @@ Vue.component(Sku.name, Sku);
 | v-model | 是否显示sku | Boolean  | false |    是      |
 | sku | 商品sku数据 | Object  | - |    是      |
 | goods | 商品信息 | Object  | - |  是 |
+| goodsId | 商品id | String/Number  | - |  是 |
 | hideStock | 是否显示商品剩余库存 | Boolean  | false | 否  |
 | showAddCartBtn | 是否显示加入购物车按钮 | Boolean  | true |  否 |
 | quota | 限购数(0表示不限购) | Number  | 0 |  否 |
diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue
index 171bf2dc3..e7ee68801 100644
--- a/packages/sku/components/SkuMessages.vue
+++ b/packages/sku/components/SkuMessages.vue
@@ -3,7 +3,7 @@
     <template v-for="(message, index) in internalMessages">
       <template v-if="message.type === 'image'"></template>
       <van-field v-else-if="message.multiple == '1'"
-        :key="collectionId + '-' + index"
+        :key="`${goodsId}-${index}`"
         :required="message.required == '1'"
         :label="message.name"
         :placeholder="placeholderMap.textarea"
@@ -11,7 +11,7 @@
         v-model="messageValues[index]">
       </van-field>
       <van-field v-else
-        :key="collectionId + '-' + index"
+        :key="goodsId + '-' + index"
         :required="message.required == '1'"
         :label="message.name"
         :placeholder="placeholderMap[message.type]"
@@ -40,7 +40,7 @@ export default {
   props: {
     messages: Array,
     messagePlaceholderMap: Object,
-    collectionId: Number
+    goodsId: [Number, String]
   },
 
   data() {
diff --git a/packages/sku/containers/SkuContainer.vue b/packages/sku/containers/SkuContainer.vue
index 59a29a4bb..2d36faa0a 100644
--- a/packages/sku/containers/SkuContainer.vue
+++ b/packages/sku/containers/SkuContainer.vue
@@ -51,7 +51,7 @@
          <slot name="sku-messages">
             <van-sku-messages
               ref="skuMessages"
-              :collectionId="sku.collection_id"
+              :goodsId="goodsId"
               :messagePlaceholderMap="messagePlaceholderMap"
               :messages="sku.messages">
             </van-sku-messages>
@@ -99,6 +99,7 @@ export default {
 
   props: {
     goods: Object,
+    goodsId: [Number, String],
     initialSku: {
       type: Object,
       default() {
@@ -314,6 +315,7 @@ export default {
         return;
       }
       this.$emit(type, {
+        goodsId: this.goodsId,
         selectedNum: this.selectedNum,
         selectedSkuComb: this.selectedSkuComb,
         messages: this.getSkuMessages(),
diff --git a/test/unit/specs/sku.spec.js b/test/unit/specs/sku.spec.js
index 3c2058373..8701972b2 100644
--- a/test/unit/specs/sku.spec.js
+++ b/test/unit/specs/sku.spec.js
@@ -24,6 +24,7 @@ describe('Sku', (done) => {
       propsData: {
         value: true,
         sku: data.sku,
+        goodsId: data.goods_id,
         goods: goods,
         resetStepperOnHide: true
       }
@@ -74,6 +75,7 @@ describe('Sku', (done) => {
       propsData: {
         value: true,
         sku: data.sku,
+        goodsId: data.goods_id,
         goods: goods
       }
     });
@@ -120,6 +122,7 @@ describe('Sku', (done) => {
       propsData: {
         value: true,
         sku: data.sku,
+        goodsId: data.goods_id,
         goods: goods,
         quota: data.quota,
         quotaUsed: data.quota_used
@@ -160,6 +163,7 @@ describe('Sku', (done) => {
       propsData: {
         value: false,
         sku: newData.sku,
+        goodsId: newData.goods_id,
         goods: goods
       }
     });
@@ -178,6 +182,7 @@ describe('Sku', (done) => {
         initialSku,
         value: true,
         sku: data.sku,
+        goodsId: data.goods_id,
         goods: goods
       }
     });
@@ -262,6 +267,7 @@ describe('Sku', (done) => {
         initialSku,
         value: true,
         sku: newData.sku,
+        goodsId: newData.goods_id,
         goods: goods
       }
     });

From f91f1984928d84f25ba74b1dbdcd51bdcff14401 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Sun, 24 Sep 2017 12:58:38 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E6=BC=8F=E6=94=B9=E4=B8=80=E5=A4=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/sku/components/SkuMessages.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue
index e7ee68801..2bc39768f 100644
--- a/packages/sku/components/SkuMessages.vue
+++ b/packages/sku/components/SkuMessages.vue
@@ -11,7 +11,7 @@
         v-model="messageValues[index]">
       </van-field>
       <van-field v-else
-        :key="goodsId + '-' + index"
+        :key="`${goodsId}-${index}`"
         :required="message.required == '1'"
         :label="message.name"
         :placeholder="placeholderMap[message.type]"

From 178656e0fb2e2ef6c52b439087b09d08eb6b31d4 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Tue, 26 Sep 2017 16:57:53 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E7=A6=81=E7=94=A8stepper=20input=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/examples-docs/sku.md                |  6 ++++--
 packages/sku/components/SkuStepper.vue   | 13 ++++++++++++-
 packages/sku/containers/SkuContainer.vue |  2 ++
 packages/stepper/index.vue               | 14 ++++++++++----
 test/unit/specs/stepper.js               | 20 +++++++++++++++++++-
 5 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/docs/examples-docs/sku.md b/docs/examples-docs/sku.md
index e01db13ab..2381a5c6d 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"
     >
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 @@
   <div class="van-sku-stepper-stock">
     <div class="van-sku-stepper-container">
       <div class="van-sku__stepper-title">{{ stepperTitle }}：</div>
-      <van-stepper v-model="currentNum" :min="1" :max="stepperLimit" class="van-sku__stepper" @overlimit="handleOverLimit"></van-stepper>
+      <van-stepper
+        class="van-sku__stepper"
+        v-model="currentNum"
+        :min="1"
+        :max="stepperLimit"
+        :disableInput="disableStepperInput"
+        @overlimit="handleOverLimit">
+      </van-stepper>
     </div>
     <div v-if="!hideStock" class="van-sku__stock">剩余{{ stock }}件</div>
     <div v-if="quota > 0" class="van-sku__quota">每人限购{{ quota }}件</div>
@@ -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">
             </van-sku-stepper>
           </slot>
@@ -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 @@
       }">
     </button>
     <input
-      type="text"
+      type="number"
       class="van-stepper__input"
       :value="currentValue"
       @input="handleInputChange"
-      :disabled="disabled">
+      :disabled="disabled || disableInput">
     <button
       @click="handleChange('plus')"
       class="van-stepper__stepper van-stepper__plus"
@@ -42,6 +42,7 @@ export default {
       default: 1
     },
     disabled: Boolean,
+    disableInput: Boolean,
     defaultValue: {
       type: [String, Number],
       default: 1
@@ -91,8 +92,13 @@ export default {
   methods: {
     // 纠正value值
     correctValue(value) {
-      value = Math.max(this.min, value);
-      value = Math.min(this.max, value);
+      if (Number.isNaN(value)) {
+        value = this.min;
+      } else {
+        value = Math.max(this.min, value);
+        value = Math.min(this.max, value);
+      }
+
       return value;
     },
     handleInputChange(event) {
diff --git a/test/unit/specs/stepper.js b/test/unit/specs/stepper.js
index 7362d6a4f..9da978e63 100644
--- a/test/unit/specs/stepper.js
+++ b/test/unit/specs/stepper.js
@@ -60,6 +60,17 @@ describe('Stepper', () => {
     });
   });
 
+  it('only disable stepper input', () => {
+    wrapper = mount(Stepper, {
+      propsData: {
+        disableInput: true
+      }
+    });
+
+    const input = wrapper.find('.van-stepper__input')[0];
+    expect(input.hasAttribute('disabled', 'disabled')).to.be.true;
+  });
+
   it('update stepper value use v-model', (done) => {
     wrapper = mount(Stepper, {
       propsData: {
@@ -96,7 +107,14 @@ describe('Stepper', () => {
     wrapper.vm.$nextTick(() => {
       expect(wrapper.vm.currentValue).to.equal(30);
       expect(eventStub.calledWith('input'));
-      done();
+
+      // value设置非数字时，则使用设置的最小值（默认1）
+      wrapper.vm.value = 'abc';
+      wrapper.update();
+      wrapper.vm.$nextTick(() => {
+        expect(wrapper.vm.currentValue).to.equal(1);
+        done();
+      });
     });
   });
 

From 3e7688170698a2d0c1f94162f0522eeb949f1871 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Tue, 26 Sep 2017 17:04:38 +0800
Subject: [PATCH 5/7] fix: update doc

---
 docs/examples-docs/sku.md     | 1 +
 docs/examples-docs/stepper.md | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/examples-docs/sku.md b/docs/examples-docs/sku.md
index 2381a5c6d..2eee8971f 100644
--- a/docs/examples-docs/sku.md
+++ b/docs/examples-docs/sku.md
@@ -132,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
 

From 93a5c8c42d31ba3da092d2fbdaa1e957c42e5f33 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Tue, 26 Sep 2017 17:30:05 +0800
Subject: [PATCH 6/7] fix: rename spec file

---
 test/unit/specs/{stepper.js => stepper.spec.js}       | 0
 test/unit/specs/{submit-bar.js => submit-bar.spec.js} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename test/unit/specs/{stepper.js => stepper.spec.js} (100%)
 rename test/unit/specs/{submit-bar.js => submit-bar.spec.js} (100%)

diff --git a/test/unit/specs/stepper.js b/test/unit/specs/stepper.spec.js
similarity index 100%
rename from test/unit/specs/stepper.js
rename to test/unit/specs/stepper.spec.js
diff --git a/test/unit/specs/submit-bar.js b/test/unit/specs/submit-bar.spec.js
similarity index 100%
rename from test/unit/specs/submit-bar.js
rename to test/unit/specs/submit-bar.spec.js

From 41576006c824966da492ba21eafd42845e338e2f Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Fri, 29 Sep 2017 14:23:58 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89stepper=E4=B8=ADin?=
 =?UTF-8?q?put[type=3Dnumber]=E5=9C=A8pc=E7=AB=AF=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84=E7=AE=AD=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/vant-css/src/stepper.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/vant-css/src/stepper.css b/packages/vant-css/src/stepper.css
index e6f9d5f29..479861c82 100644
--- a/packages/vant-css/src/stepper.css
+++ b/packages/vant-css/src/stepper.css
@@ -80,4 +80,13 @@
     text-align: center;
     -webkit-appearance: none;
   }
+
+  input[type=number]::-webkit-inner-spin-button,
+  input[type=number]::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+  input[type=number] {
+    -moz-appearance: textfield;
+  }
 }