Merge branch 'master' of gitlab.qima-inc.com:weapp/zui

dist/btn/index.wxss

@@ -60,7 +60,7 @@
   padding-left: 5px;
   padding-right: 5px;
 }
-.zui-btn--big {
+.zui-btn--large {
   border-radius: 0;
   margin-bottom: 0;
   border: none;
@@ -125,11 +125,12 @@
 
 /* disabled */
 .zui-btn.zui-btn--disabled {
-  color: #999;
+  /* 防止样式被 button[disabled] 的规则覆盖，所以使用了important */
-  background: #f8f8f8;
+  color: #999 ! important;
-  border-color: #e5e5e5;
+  background: #f8f8f8 ! important;
-  cursor: not-allowed;
+  border-color: #e5e5e5 ! important;
-  opacity: 1;
+  cursor: not-allowed ! important;
+  opacity: 1 ! important;
 }
 
 /* ::last-child */

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 }}"

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;
+}

example/btn/index.wxml

@@ -8,9 +8,9 @@
   </view>
 
   <view class="zui-panel">
-    <button class="zui-btn zui-btn--big zui-btn--primary">确认付款</button>
+    <button class="zui-btn zui-btn--large zui-btn--primary">确认付款</button>
-    <button class="zui-btn zui-btn--big zui-btn--warn">立即购买</button>
+    <button class="zui-btn zui-btn--large zui-btn--warn">立即购买</button>
-    <button class="zui-btn zui-btn--big zui-btn--danger">立即购买</button>
+    <button class="zui-btn zui-btn--large zui-btn--danger">立即购买</button>
   </view>
 
   <view class="zui-panel" style="padding: 15px;">

example/dialog/index.wxml

@@ -2,7 +2,7 @@
 
   <view class="zui-btns">
     <button
-      class="zui-btn zui-btn--primary zui-btn--big"
+      class="zui-btn zui-btn--primary zui-btn--large"
       bindtap="toggleDialog"
       style="margin-top: 40vh;"
     >

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
     }
   },
 

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>

example/toast/index.wxml

@@ -3,7 +3,7 @@
 <view class="container">
   <view class="zui-btns">
     <button
-      class="zui-btn zui-btn--primary zui-btn--big"
+      class="zui-btn zui-btn--primary zui-btn--large"
       catchtap="showToast"
       style="margin-top: 40vh;"
     >

example/toptips/index.wxml

@@ -3,7 +3,7 @@
 <view class="container">
   <view class="zui-btns">
     <button
-      class="zui-btn zui-btn--primary zui-btn--big"
+      class="zui-btn zui-btn--primary zui-btn--large"
       catchtap="showTopTips"
       style="margin-top: 40vh;"
     >