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

bower.json

@@ -11,7 +11,7 @@
   "homepage": "",
   "ignore": [
     "**/.*",
-    "pages",
+    "example",
     "app.*",
     "*.md"
   ]

dist/helper/index.wxss

@@ -65,3 +65,12 @@
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }
+
+.zui-clearfix {
+  zoom: 1;
+}
+.zui-clearfix::after {
+  content: '';
+  display: table;
+  clear: both;
+}

dist/loadmore/index.wxml

@@ -1,4 +1,4 @@
-<template name="loadmore">
+<template name="zui-loadmore">
 
   <block wx:if="{{nomore}}">
     <view class="zui-loadmore zui-loadmore--nomore">

dist/quantity/index.js

@@ -10,15 +10,18 @@ function handle(e, num) {
 }
 
 function callback(componentId, quantity) {
+  quantity = +quantity;
+  var e = { componentId, quantity };
+  console.info('[zui:quantity:change]', e);
+
   if (this.handleZuiQuantityChange) {
-    quantity = +quantity;
-    var e = { componentId, quantity };
-    console.info('[ZUI:Quantity:Change]', e);
     this.handleZuiQuantityChange(e);
+  } else {
+    console.warn('页面缺少 handleZuiQuantityChange 回调函数');
   }
 }
 
-var ComponentQuantity = {
+var Quantity = {
   _handleZuiQuantityMinus(e) {
     handle.call(this, e, -1);
   },
@@ -55,4 +58,4 @@ var ComponentQuantity = {
   }
 };
 
-module.exports = ComponentQuantity;
+module.exports = Quantity;

dist/tab/index.js

@@ -3,16 +3,13 @@ var Tab = {
     var dataset = e.currentTarget.dataset;
     var componentId = dataset.componentId;
     var selectedId = dataset.itemId;
+    var data = { componentId, selectedId };
 
+    console.info('[zui:tab:change]', data);
     if (this.handleZuiTabChange) {
-      console.info('[ZUI:Tab:Change]', {
+      this.handleZuiTabChange(data);
-        componentId,
+    } else {
-        selectedId
+      console.warn('页面缺少 handleZuiTabChange 回调函数');
-      });
-      this.handleZuiTabChange({
-        componentId,
-        selectedId
-      });
     }
   }
 };