From d4b04ed71f540d46022e1f44b889e284390be78c Mon Sep 17 00:00:00 2001 From: Rainy Date: Mon, 18 Jan 2021 15:47:37 +0800 Subject: [PATCH 1/7] readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index a83246b..834364f 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,12 @@ export default { - 使用出现问题可参考[常见问题汇总](https://github.com/iRainy6661/uni-load-refresh/issues/2) - 如果对您有帮助，请鼓励支持一下，[![GitHub stars](https://img.shields.io/github/stars/iRainy6661/uni-load-refresh?style=falt)](https://github.com/iRainy6661/uni-load-refresh)。 +#### Beta 预发测试 + +*[v2.1-beta.0](https://github.com/iRainy6661/uni-load-refresh/releases/tag/v2.1-beta.0)* [2021/1/18] + +增加刷新动画前的手势交互动作，**↓ 下拉刷新** `=>` **↑ 松开释放** + #### Demo 代码示例 ``` From 5ca0f4c8dc8cc8a90601c65899ded918a2a91923 Mon Sep 17 00:00:00 2001 From: Rainy Date: Tue, 19 Jan 2021 11:07:54 +0800 Subject: [PATCH 2/7] scss --- components/load-refresh/load-refresh.vue | 39 ++++++++++++------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/components/load-refresh/load-refresh.vue b/components/load-refresh/load-refresh.vue index f01ecd0..10c7c95 100644 --- a/components/load-refresh/load-refresh.vue +++ b/components/load-refresh/load-refresh.vue @@ -176,6 +176,25 @@ From 37bbabf0b6c5263272138719d98bfdabb7bc072e Mon Sep 17 00:00:00 2001 From: Rainy Date: Thu, 4 Mar 2021 16:08:43 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0fixedHeight=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/load-refresh/load-refresh.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/components/load-refresh/load-refresh.vue b/components/load-refresh/load-refresh.vue index 10c7c95..f918b19 100644 --- a/components/load-refresh/load-refresh.vue +++ b/components/load-refresh/load-refresh.vue @@ -54,6 +54,10 @@ type: String, default: 'hollowDots' }, + fixedHeight: { + type: String, + default: '' + }, heightReduce: { type: String, default: '0' @@ -92,8 +96,12 @@ // 计算组件所占屏幕高度 getHeight() { // rpx = px / uni.getSystemInfoSync().windowWidth * 750 - let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(0 + this.heightReduce) - return `height: ${height}px;` + if (this.fixedHeight) { + return `height: ${this.fixedHeight}rpx;` + } else { + let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(0 + this.heightReduce) + return `height: ${height}px;` + } }, // 判断loadText，可以根据需求自定义 loadText() { From 2ff3f483024ebeb65199734085734328d392386e Mon Sep 17 00:00:00 2001 From: Rainy Date: Fri, 5 Mar 2021 10:09:04 +0800 Subject: [PATCH 4/7] update --- .hbuilderx/launch.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .hbuilderx/launch.json diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 0000000..501e01c --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,11 @@ +{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version": "0.0", + "configurations": [{ + "type": "uniCloud", + "default": { + "launchtype": "remote" + } + } + ] +} From 33f9d8d386d566f2dcc21c03bf74b20b4abc3320 Mon Sep 17 00:00:00 2001 From: Rainy Date: Fri, 5 Mar 2021 11:11:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?readme=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- components/load-refresh/load-refresh.vue | 4 ++-- pages/index/index.vue | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 834364f..128ff5a 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,8 @@ export default { | isRefresh | Boolean | true | 是否开启手势下拉刷新功能(true: 开启; false: 关闭) | | refreshType | String | hollowDots | 刷新动画，可选类型参数(hollowDots, halfCircle, swappingSquares) | | color | String | #F3F5F5 | 自定义动画颜色 | -| heightReduce | String | 0 | 裁剪高度(在整个屏幕高度中除该组件外，其余部分占据的高度，单位：rpx) | +| fixedHeight | String | 0 | 固定高度(优先级：fixedHeight > heightReduce；适用于确定组件容器高度的情况下；单位：rpx) | +| heightReduce | String | 0 | 裁剪高度(在整个屏幕高度中除该组件外，其余部分占据的高度；适用于不确定组件容器高度，欲撑满屏幕；单位：rpx) | | backgroundCover | String | white | 数据列表块背景色 | | pageNo | Number | 0 | 当前页码 | | totalPageNo | Number | 0 | 总页数 | diff --git a/components/load-refresh/load-refresh.vue b/components/load-refresh/load-refresh.vue index f918b19..0b102b5 100644 --- a/components/load-refresh/load-refresh.vue +++ b/components/load-refresh/load-refresh.vue @@ -56,7 +56,7 @@ }, fixedHeight: { type: String, - default: '' + default: '0' }, heightReduce: { type: String, @@ -96,7 +96,7 @@ // 计算组件所占屏幕高度 getHeight() { // rpx = px / uni.getSystemInfoSync().windowWidth * 750 - if (this.fixedHeight) { + if (Number(this.fixedHeight)) { return `height: ${this.fixedHeight}rpx;` } else { let height = uni.getSystemInfoSync().windowHeight - uni.upx2px(0 + this.heightReduce) diff --git a/pages/index/index.vue b/pages/index/index.vue index f872d0a..b921d2e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,7 +4,6 @@ :isRefresh="true" refreshType="hollowDots" color="#04C4C4" - heightReduce="0" backgroundCover="#F3F5F5" :pageNo="currPage" :totalPageNo="totalPage" From 1a3c57535eb00dd46aa09a2bbadc457b83cf8316 Mon Sep 17 00:00:00 2001 From: Rainy Date: Fri, 5 Mar 2021 14:05:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index af43769..34d6d12 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "uni-load-refresh", "appid" : "__UNI__B809977", "description" : "", - "versionName" : "1.2.0", - "versionCode" : "100", + "versionName" : "2.1.1", + "versionCode" : "211", "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From 63da45f1d6d49429603d9446c0751944b06c2d25 Mon Sep 17 00:00:00 2001 From: Rainy Date: Fri, 5 Mar 2021 14:06:27 +0800 Subject: [PATCH 7/7] =?UTF-8?q?readme=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 128ff5a..ffc7b23 100644 --- a/README.md +++ b/README.md @@ -91,12 +91,6 @@ export default { - 使用出现问题可参考[常见问题汇总](https://github.com/iRainy6661/uni-load-refresh/issues/2) - 如果对您有帮助，请鼓励支持一下，[![GitHub stars](https://img.shields.io/github/stars/iRainy6661/uni-load-refresh?style=falt)](https://github.com/iRainy6661/uni-load-refresh)。 -#### Beta 预发测试 - -*[v2.1-beta.0](https://github.com/iRainy6661/uni-load-refresh/releases/tag/v2.1-beta.0)* [2021/1/18] - -增加刷新动画前的手势交互动作，**↓ 下拉刷新** `=>` **↑ 松开释放** - #### Demo 代码示例 ```