From 33b0f7cbca8be183629abb4a37521e1d2b0c118f Mon Sep 17 00:00:00 2001
From: wny <colonD.wny@gmail.com>
Date: Sun, 24 Sep 2017 00:12:17 -0500
Subject: [PATCH] fix: sku message key (#142)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: sku message key

* fix: 改用goods_id当key

* fix: 漏改一处
---
 docs/examples-docs/sku.md                | 4 ++++
 packages/sku/components/SkuMessages.vue  | 7 ++++---
 packages/sku/containers/SkuContainer.vue | 3 +++
 test/unit/specs/sku.spec.js              | 6 ++++++
 4 files changed, 17 insertions(+), 3 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 66ef71905..2bc39768f 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="`${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="index"
+        :key="`${goodsId}-${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,
+    goodsId: [Number, String]
   },
 
   data() {
diff --git a/packages/sku/containers/SkuContainer.vue b/packages/sku/containers/SkuContainer.vue
index e74736eeb..2d36faa0a 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"
+              :goodsId="goodsId"
               :messagePlaceholderMap="messagePlaceholderMap"
               :messages="sku.messages">
             </van-sku-messages>
@@ -98,6 +99,7 @@ export default {
 
   props: {
     goods: Object,
+    goodsId: [Number, String],
     initialSku: {
       type: Object,
       default() {
@@ -313,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
       }
     });