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

This commit is contained in:
pangxie1991 2016-12-20 17:35:18 +08:00
commit 1233ca59a9
5 changed files with 24 additions and 15 deletions

View File

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

View File

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

View File

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

View File

@ -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;

13
dist/tab/index.js vendored
View File

@ -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]', {
componentId,
selectedId
});
this.handleZuiTabChange({
componentId,
selectedId
});
this.handleZuiTabChange(data);
} else {
console.warn('页面缺少 handleZuiTabChange 回调函数');
}
}
};