Merge remote-tracking branch 'origin/master' into hotfix/waterfall

This commit is contained in:
pangxie1991
2017-02-27 10:35:19 +08:00
91 changed files with 939 additions and 268 deletions

View File

@@ -10,8 +10,9 @@ import Dialog from '../packages/dialog/index.js';
import Picker from '../packages/picker/index.js';
import RadioGroup from '../packages/radio-group/index.js';
import Waterfall from '../packages/waterfall/index.js';
// zanui
import '../packages/zanui-css/src/index.pcss';
import Loading from '../packages/loading/index.js';
import Panel from '../packages/panel/index.js';
import Card from '../packages/card/index.js';
const install = function(Vue) {
if (install.installed) return;
@@ -26,6 +27,9 @@ const install = function(Vue) {
Vue.component(Popup.name, Popup);
Vue.component(Picker.name, Picker);
Vue.component(RadioGroup.name, RadioGroup);
Vue.component(Loading.name, Loading);
Vue.component(Panel.name, Panel);
Vue.component(Card.name, Card);
};
// auto install
@@ -47,5 +51,8 @@ module.exports = {
Dialog,
Picker,
RadioGroup,
Waterfall
Waterfall,
Loading,
Panel,
Card
};