From 3696fadc25bd94ca9e8b9038c6836fc276555a13 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Mon, 13 Mar 2017 19:40:25 +0800
Subject: [PATCH] fix picker

---
 docs/examples-docs/card.md            |  1 -
 packages/picker/src/picker-column.vue |  5 +++--
 packages/picker/src/picker.vue        | 14 ++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/examples-docs/card.md b/docs/examples-docs/card.md
index eb1678365..60a462497 100644
--- a/docs/examples-docs/card.md
+++ b/docs/examples-docs/card.md
@@ -27,7 +27,6 @@
     <span class="zan-card__price">¥ 2.00</span>
   </div>
   <div class="zan-card__row" slot="desc">
-    <h4 class="zan-card__desc">商品sku</h4>
     <span class="zan-card__num">x 2</span>
   </div>
   <div class="zan-card__footer" slot="footer">
diff --git a/packages/picker/src/picker-column.vue b/packages/picker/src/picker-column.vue
index 50f639564..a9b631dbf 100644
--- a/packages/picker/src/picker-column.vue
+++ b/packages/picker/src/picker-column.vue
@@ -6,7 +6,7 @@
         class="zan-picker-column__item"
         :class="{ 'zan-picker-column__item--selected': item === currentValue }"
         :style="{ height: itemHeight + 'px', lineHeight: itemHeight + 'px' }">
-        {{item}}
+        {{ typeof item === 'object' && item[valueKey] ? item[valueKey] : item }}
       </div>
     </div>
   </div>
@@ -52,7 +52,8 @@ export default {
       type: Number,
       default: DEFAULT_ITEM_HEIGHT
     },
-    value: {}
+    value: {},
+    valueKey: String
   },
 
   data() {
diff --git a/packages/picker/src/picker.vue b/packages/picker/src/picker.vue
index 9870f5c7b..2ea6e487f 100644
--- a/packages/picker/src/picker.vue
+++ b/packages/picker/src/picker.vue
@@ -14,7 +14,8 @@
         :class-name="item.className"
         :itemHeight="itemHeight"
         :visible-item-count="visibleItemCount"
-        @change="columnValueChange">
+        :value-key="valueKey"
+        @change="columnValueChange(index)">
       </picker-column>
       <div class="zan-picker-center-highlight" :style="{ height: itemHeight + 'px', marginTop: -itemHeight / 2 + 'px' }"></div>
     </div>
@@ -63,7 +64,8 @@ export default {
     showToolbar: {
       type: Boolean,
       default: false
-    }
+    },
+    valueKey: String
   },
 
   computed: {
@@ -81,16 +83,16 @@ export default {
 
   methods: {
     handlePickerCancel() {
-      this.$emit('cancel');
+      this.$emit('cancel', this.values);
     },
     handlePickerConfirm() {
-      this.$emit('confirm');
+      this.$emit('confirm', this.values);
     },
     /**
      * 处理列`change`事件
      */
-    columnValueChange() {
-      this.$emit('change', this, this.values);
+    columnValueChange(index) {
+      this.$emit('change', this, this.values, index);
     },
 
     /**