From ed112e6cc3799886d2503ba00079c5d2ff298f54 Mon Sep 17 00:00:00 2001
From: Nino <ninofocus@gmail.com>
Date: Tue, 27 Dec 2016 15:01:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=8F=E5=8F=B7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/quantity/index.wxml    | 2 +-
 dist/quantity/index.wxss    | 9 +++++++++
 example/quantity/index.js   | 7 ++++++-
 example/quantity/index.wxml | 7 +++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dist/quantity/index.wxml b/dist/quantity/index.wxml
index dc4f4c59..15cd7391 100644
--- a/dist/quantity/index.wxml
+++ b/dist/quantity/index.wxml
@@ -1,5 +1,5 @@
 <template name="zui-quantity">
-  <view class="zui-quantity">
+  <view class="zui-quantity {{ size === 'small' ? 'zui-quantity--small' : '' }}">
     <view
       class="zui-quantity__minus {{ quantity <= min ? 'zui-quantity--disabled' : '' }}"
       data-component-id="{{ componentId }}"
diff --git a/dist/quantity/index.wxss b/dist/quantity/index.wxss
index 9b81aeed..b39bf63c 100644
--- a/dist/quantity/index.wxss
+++ b/dist/quantity/index.wxss
@@ -35,3 +35,12 @@
   color: #bbb;
   border-color: #e8e8e8;
 }
+.zui-quantity--small view {
+  min-width: 36px;
+  line-height: 18px;
+}
+.zui-quantity--small .zui-quantity__text {
+  width: 36px;
+  line-height: 28px;
+  height: 28px;
+}
diff --git a/example/quantity/index.js b/example/quantity/index.js
index 11c6926c..4406c270 100644
--- a/example/quantity/index.js
+++ b/example/quantity/index.js
@@ -3,7 +3,7 @@ var ZUI = require('../../dist/index');
 Page(Object.assign({}, ZUI.Quantity, {
   data: {
     quantity1: {
-      quantity: 1,
+      quantity: 10,
       min: 1,
       max: 20
     },
@@ -11,6 +11,11 @@ Page(Object.assign({}, ZUI.Quantity, {
       quantity: 1,
       min: 1,
       max: 1
+    },
+    quantity3: {
+      quantity: 10,
+      min: 1,
+      max: 20
     }
   },
 
diff --git a/example/quantity/index.wxml b/example/quantity/index.wxml
index 3d3b65e0..42aa274e 100644
--- a/example/quantity/index.wxml
+++ b/example/quantity/index.wxml
@@ -4,7 +4,14 @@
   <view style="padding: 40px 15px">
     <template is="zui-quantity" data="{{ ...quantity1, componentId: 'quantity1' }}" />
   </view>
+
+  <!-- 当最大值等于最小值时，组件不可用 -->
   <view style="padding: 40px 15px ">
     <template is="zui-quantity" data="{{ ...quantity2, componentId: 'quantity2' }}" />
   </view>
+
+  <!-- small size -->
+  <view style="padding: 40px 15px ">
+    <template is="zui-quantity" data="{{ ...quantity3, componentId: 'quantity3', size: 'small' }}" />
+  </view>
 </view>