diff --git a/example/app.json b/example/app.json
index 07c44601..d4e2ccc9 100644
--- a/example/app.json
+++ b/example/app.json
@@ -27,7 +27,8 @@
"pages/toast/index",
"pages/tree-select/index",
"pages/select/index",
- "pages/datetime/index"
+ "pages/datetime/index",
+ "pages/loadmore/index"
],
"window": {
"navigationBarBackgroundColor": "#FAFAFA",
diff --git a/example/pages/dashboard/config.js b/example/pages/dashboard/config.js
index c04b7929..6c588003 100644
--- a/example/pages/dashboard/config.js
+++ b/example/pages/dashboard/config.js
@@ -62,6 +62,9 @@ export default {
}, {
name: 'Tag 标记',
path: '/pages/tag/index'
+ }, {
+ name: 'Loadmore 加载更多',
+ path: '/pages/loadmore/index'
}
]
},
diff --git a/example/pages/loadmore_bak/index.js b/example/pages/loadmore/index.js
similarity index 100%
rename from example/pages/loadmore_bak/index.js
rename to example/pages/loadmore/index.js
diff --git a/example/pages/loadmore/index.json b/example/pages/loadmore/index.json
new file mode 100644
index 00000000..f182cecd
--- /dev/null
+++ b/example/pages/loadmore/index.json
@@ -0,0 +1,8 @@
+{
+ "navigationBarTitleText": "loadmore 加载",
+ "usingComponents": {
+ "zan-panel": "../../dist/panel/index",
+ "zan-loadmore": "../../dist/loadmore/index",
+ "doc-page": "../../components/doc-page/index"
+ }
+}
diff --git a/example/pages/loadmore/index.wxml b/example/pages/loadmore/index.wxml
new file mode 100644
index 00000000..c0949921
--- /dev/null
+++ b/example/pages/loadmore/index.wxml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/example/pages/loadmore/index.wxss b/example/pages/loadmore/index.wxss
new file mode 100644
index 00000000..1767a3f0
--- /dev/null
+++ b/example/pages/loadmore/index.wxss
@@ -0,0 +1,5 @@
+
+
+zan-loadmore {
+ margin: 15px;
+}
diff --git a/example/pages/loadmore_bak/index.json b/example/pages/loadmore_bak/index.json
deleted file mode 100644
index a9b5f329..00000000
--- a/example/pages/loadmore_bak/index.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "navigationBarTitleText": "Loadmore 加载"
-}
diff --git a/example/pages/loadmore_bak/index.wxml b/example/pages/loadmore_bak/index.wxml
deleted file mode 100644
index bba9b1ed..00000000
--- a/example/pages/loadmore_bak/index.wxml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- LOADMORE
-
-
-
-
-
diff --git a/packages/loadmore/README.md b/packages/loadmore/README.md
index 8a10856c..9231ca41 100644
--- a/packages/loadmore/README.md
+++ b/packages/loadmore/README.md
@@ -1,26 +1,26 @@
## Loadmore 加载
### 使用指南
-在 app.wxss 中引入组件库所有样式
-```css
-@import "path/to/zanui-weapp/dist/index.wxss";
+在 index.json 中引入组件
+```json
+ {
+ ...
+ "usingComponents": {
+ "zan-loadmore": "../../dist/loadmore/index"
+ }
+ ...
+ }
```
-在需要使用的页面里引入组件库模板
+在页面上直接使用 zan-loadmore 标签即可
```html
-
-
-
-
+
+
+
```
-### 代码演示
-`loadmore` 支持三种状态,loading, nodata, nomore。传入指定的值即可显示
-```html
-
-
-
-
-
-
-```
+### 具体参数
+| 名称 | 类型 | 是否必须 | 默认 | 描述 |
+| ------- | --------------- | -------- | ----- | ----------------- |
+| type | String | 是 | loading | 可选`loading`, `text` |
+| text | String | 否 | 暂无数据 | 文案 |
diff --git a/packages/loadmore/index.js b/packages/loadmore/index.js
new file mode 100644
index 00000000..e5ac6ac2
--- /dev/null
+++ b/packages/loadmore/index.js
@@ -0,0 +1,12 @@
+Component({
+ properties: {
+ type: {
+ type: String,
+ value: 'loading'
+ },
+ text: {
+ type: String,
+ value: ''
+ }
+ }
+});
diff --git a/packages/loadmore/index.json b/packages/loadmore/index.json
new file mode 100644
index 00000000..467ce294
--- /dev/null
+++ b/packages/loadmore/index.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+}
diff --git a/packages/loadmore/index.pcss b/packages/loadmore/index.pcss
index 419096c1..a4f64de5 100644
--- a/packages/loadmore/index.pcss
+++ b/packages/loadmore/index.pcss
@@ -1,12 +1,36 @@
@import "../common/_mixins";
.zan-loadmore {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ min-height: 24px;
+ line-height: 24px;
+ font-size: 12px;
+}
+
+.zan-loadmore__line {
+ flex: 1;
+ height: 1px;
position: relative;
- width: 65%;
- margin: 21px auto;
- line-height: 20px;
- font-size: 14px;
- text-align: center;
+
+ &::after {
+ @mixin hairline;
+ border-bottom-width: 1px;
+ }
+}
+
+.zan-loadmore__text, .zan-loadmore__dot {
+ margin: 0 5px;
+}
+
+.zan-loadmore__dot {
+ content: "";
+ width: 4px;
+ height: 4px;
+ border-radius: 50%;
+ background-color: #E5E5E5;
+ display: inline-block;
vertical-align: middle;
}
@@ -21,58 +45,9 @@
background-size: 100%;
}
-.zan-loadmore .zan-loading {
- margin-right: 4px;
-}
-
.zan-loadmore__tips {
display: inline-block;
vertical-align: middle;
- height: 20px;
- line-height: 20px;
-}
-
-.zan-loadmore--nodata,
-.zan-loadmore--nomore {
- color: #999;
-
- &::after {
- @mixin hairline;
- border-top-width: 1px;
- }
-}
-
-.zan-loadmore--nodata {
- margin-top: 120px;
-}
-
-.zan-loadmore--nodata .zan-loadmore__tips {
- position: relative;
- top: -11px;
- background: #f9f9f9;
- padding: 0 6px;
- z-index: 1;
-}
-
-.zan-loadmore--nomore .zan-loadmore__tips {
- position: relative;
- top: -11px;
- background: #f9f9f9;
- padding: 0 6px;
- z-index: 1;
-}
-
-.zan-loadmore__dot {
- position: absolute;
- left: 50%;
- top: 10px;
- margin-left: -2px;
- margin-top: -2px;
- content: " ";
- width: 4px;
- height: 4px;
- border-radius: 50%;
- background-color: #E5E5E5;
- display: inline-block;
- vertical-align: middle;
+ height: 24px;
+ line-height: 24px;
}
diff --git a/packages/loadmore/index.wxml b/packages/loadmore/index.wxml
index 8c41cf40..af349a81 100644
--- a/packages/loadmore/index.wxml
+++ b/packages/loadmore/index.wxml
@@ -1,24 +1,12 @@
-
-
-
-
-
-
-
-
+
+
+
+ 加载中...
-
-
-
- {{ nodata_str || '暂无数据' }}
-
+
+
+ {{ text }}
+
+
-
-
-
-
- 加载中...
-
-
-
-
+
\ No newline at end of file