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

bower.json

@@ -4,9 +4,9 @@
     "Nino <nino@youzan.com>",
     "Pangxie <pangxie@youzan.com>"
   ],
+  "directory": "zui",
   "description": "A UI Library for Weapp",
-  "main": "zui/index.js",
-  "moduleType": [],
+  "main": "zui",
   "license": "MIT",
   "homepage": "",
   "ignore": [
@@ -18,6 +18,7 @@
     "pages",
     "app.js",
     "app.json",
+    "app.wxss",
     "bower.json"
   ]
 }

pages/loadmore/index.wxml

@@ -1,7 +1,7 @@
-<import src="/zui/loadmore.wxml" />
+<import src="/zui/loadmore/index.wxml" />
 
 <view class="container">
   <template is="loadmore" data="{{loading: true}}" />
-  <template is="loadmore" data="{{nomore: true}}" />
   <template is="loadmore" data="{{nodata: true}}" />
+  <template is="loadmore" data="{{nomore: true}}" />
 </view>