Skip to content

Commit 2548aa3

Browse files
mescrollmescroll
committed
mescroll-uni 1.1.8
1 parent 188a06c commit 2548aa3

File tree

8 files changed

+32
-20
lines changed

8 files changed

+32
-20
lines changed

‎mescroll-uni/dist/mescroll-uni.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* mescroll-uni
2-
* version 1.1.7
3-
* 2019-10-15 wenju
2+
* version 1.1.8
3+
* 2019-11-01 wenju
44
* http://www.mescroll.com
55
*/
66

‎mescroll-uni/dist/mescroll-uni.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* mescroll-uni
2-
* version 1.1.7
3-
* 2019-10-15 wenju
2+
* version 1.1.8
3+
* 2019-11-01 wenju
44
* http://www.mescroll.com
55
*/
66

77
export default function MeScroll(options) {
88
let me = this;
9-
me.version = '1.1.7'; // mescroll版本号
9+
me.version = '1.1.8'; // mescroll版本号
1010
me.options = options || {}; // 配置
1111

1212
me.isDownScrolling = false; // 是否在执行下拉刷新的回调
@@ -258,6 +258,12 @@ MeScroll.prototype.touchendEvent = function(e) {
258258

259259
/* 根据点击滑动事件获取第一个手指的坐标 */
260260
MeScroll.prototype.getPoint = function(e) {
261+
if (!e) {
262+
return {
263+
x: 0,
264+
y: 0
265+
}
266+
}
261267
if (e.touches && e.touches[0]) {
262268
return {
263269
x: e.touches[0].pageX,

‎mescroll-uni/dist/mescroll-uni.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
<!-- 上拉加载区域 -->
2424
<view v-if="mescroll.optUp.use" class="mescroll-upwarp">
25-
<!-- 加载中.. -->
26-
<template v-if="isUpLoading">
25+
<!-- 加载中 (此处不能用v-if,否则android小程序快速上拉可能会不断触发上拉回调) -->
26+
<view v-show="isUpLoading">
2727
<view class="upwarp-progress mescroll-rotate"></view>
2828
<view class="upwarp-tip">{{mescroll.optUp.textLoading}}</view>
29-
</template>
29+
</view>
3030
<!-- 无数据 -->
3131
<view v-if="!isDownLoading && isUpNoMore" class="upwarp-nodata">{{mescroll.optUp.textNoMore}}</view>
3232
</view>

‎mescroll-uni/uni-demo/components/mescroll-diy/mescroll-beibei.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<!-- 上拉加载区域 -->
2626
<view v-if="mescroll.optUp.use" class="mescroll-upwarp">
2727
<!-- 加载中.. -->
28-
<template v-if="isUpLoading">
28+
<view v-show="isUpLoading">
2929
<view class="upwarp-progress mescroll-rotate"></view>
3030
<view class="upwarp-tip">{{mescroll.optUp.textLoading}}</view>
31-
</template>
31+
</view>
3232
<!-- 无数据 -->
3333
<view v-if="!isDownLoading && isUpNoMore" class="upwarp-nodata">{{mescroll.optUp.textNoMore}}</view>
3434
</view>

‎mescroll-uni/uni-demo/components/mescroll-diy/mescroll-xinlang.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
<!-- 上拉加载区域 -->
2525
<view v-if="mescroll.optUp.use" class="mescroll-upwarp">
2626
<!-- 加载中.. -->
27-
<template v-if="isUpLoading">
27+
<view v-show="isUpLoading">
2828
<view class="upwarp-progress mescroll-rotate"></view>
2929
<view class="upwarp-tip">{{mescroll.optUp.textLoading}}</view>
30-
</template>
30+
</view>
3131
<!-- 无数据 -->
3232
<view v-if="!isDownLoading && isUpNoMore" class="upwarp-nodata">{{mescroll.optUp.textNoMore}}</view>
3333
</view>

‎mescroll-uni/uni-demo/components/mescroll-uni/mescroll-uni.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* mescroll-uni
2-
* version 1.1.7
3-
* 2019-10-15 wenju
2+
* version 1.1.8
3+
* 2019-11-01 wenju
44
* http://www.mescroll.com
55
*/
66

‎mescroll-uni/uni-demo/components/mescroll-uni/mescroll-uni.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* mescroll-uni
2-
* version 1.1.7
3-
* 2019-10-15 wenju
2+
* version 1.1.8
3+
* 2019-11-01 wenju
44
* http://www.mescroll.com
55
*/
66

77
export default function MeScroll(options) {
88
let me = this;
9-
me.version = '1.1.7'; // mescroll版本号
9+
me.version = '1.1.8'; // mescroll版本号
1010
me.options = options || {}; // 配置
1111

1212
me.isDownScrolling = false; // 是否在执行下拉刷新的回调
@@ -258,6 +258,12 @@ MeScroll.prototype.touchendEvent = function(e) {
258258

259259
/* 根据点击滑动事件获取第一个手指的坐标 */
260260
MeScroll.prototype.getPoint = function(e) {
261+
if (!e) {
262+
return {
263+
x: 0,
264+
y: 0
265+
}
266+
}
261267
if (e.touches && e.touches[0]) {
262268
return {
263269
x: e.touches[0].pageX,

‎mescroll-uni/uni-demo/components/mescroll-uni/mescroll-uni.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
<!-- 上拉加载区域 -->
2424
<view v-if="mescroll.optUp.use" class="mescroll-upwarp">
25-
<!-- 加载中.. -->
26-
<template v-if="isUpLoading">
25+
<!-- 加载中 (此处不能用v-if,否则android小程序快速上拉可能会不断触发上拉回调) -->
26+
<view v-show="isUpLoading">
2727
<view class="upwarp-progress mescroll-rotate"></view>
2828
<view class="upwarp-tip">{{mescroll.optUp.textLoading}}</view>
29-
</template>
29+
</view>
3030
<!-- 无数据 -->
3131
<view v-if="!isDownLoading && isUpNoMore" class="upwarp-nodata">{{mescroll.optUp.textNoMore}}</view>
3232
</view>

0 commit comments

Comments
 (0)