diff --git a/pages.json b/pages.json
index 95dee66..72e8341 100644
--- a/pages.json
+++ b/pages.json
@@ -388,7 +388,7 @@
"style": {
"navigationBarTitleText": "里海云仓",
"navigationStyle": "custom",
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": false
}
},
{
diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index 8ae559f..8a87421 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/pages/cloud_warehouse/home/home.vue
@@ -307,11 +307,12 @@
+ :refresher-enabled="true" :refresher-triggered="isTriggered" @refresherpulling="onPulling"
+ @refresherrefresh="onRefresh" :refresher-threshold="45" :scroll-anchoring='true'>
-
+
@@ -375,6 +376,7 @@
wrapHeight: 300,
isShowSmall: false,
scrollTop: 0,
+ isTriggered: true
}
},
onLoad(option) {
@@ -399,20 +401,27 @@
}
},
methods: {
- onAllCategory() {
- this.$refs.popup.open();
+ // 下拉加载
+ onPulling() {
+ if (!this.isTriggered) {
+ this.isTriggered = true;
+ this.getProductslist(true);
+ }
},
-
- scrolltoupper() {
- this.getProductslist(true);
+ onRefresh(e) {
+ this.isTriggered = true;
},
onScrollBottom(e) {
this.getProductslist();
},
+ onAllCategory() {
+ this.$refs.popup.open();
+ },
+
onScroll(e) {
- if (this.scrollTop >= e.target.scrollTop) { //上拉
+ if (this.scrollTop > e.target.scrollTop) { //上拉
this.wrapHeight = 300;
if (this.where.cate_pid) this.wrapHeight = this.wrapHeight + 48;
} else {
@@ -453,6 +462,7 @@
this.$refs.popup && this.$refs.popup.close();
},
+
changeChildrenCate(e) {
this.cate_change_children = e;
this.where.cate_pid = this.store_category_children[e].store_category_id;
@@ -486,13 +496,13 @@
getProductslist(this.where).then(res => {
this.where.limit = res.data.limit
this.where.page = res.data.page
- uni.stopPullDownRefresh();
+ this.isTriggered = false;
this.hostProduct = [...this.hostProduct, ...res.data.list];
this.isLoading = 0;
if (res.data.list.length < this.where.limit) this.isLoading = -1;
this.where.page++;
}).catch(err => {
- uni.stopPullDownRefresh();
+ this.isTriggered = false;
})
},
goDetail(item) {
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 9abb926..b733ff4 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -69,7 +69,8 @@
+ :refresher-enabled="true" :refresher-triggered="isTriggered" @refresherpulling="onPulling"
+ @refresherrefresh="onRefresh" :refresher-threshold="45" :scroll-anchoring='true'>
@@ -113,7 +114,7 @@
-
+
@@ -193,6 +194,7 @@
},
wrapHeight: 300,
scrollTop: 0,
+ isTriggered: false
}
},
computed: {
@@ -219,30 +221,32 @@
this.merClassifly();
this.storeMerchantList();
},
- onReachBottom() {
- // this.storeMerchantList();
- },
onPageScroll() {
uni.$emit('scroll');
},
- onPullDownRefresh() {
- // this.storeMerchantList(true);
- },
methods: {
- onAllCategory() {
- this.$refs.popup.open();
+ // 下拉加载
+ onPulling() {
+ if (!this.isTriggered) {
+ this.isTriggered = true;
+ this.storeMerchantList(true);
+ }
},
- scrolltoupper() {
- this.storeMerchantList(true);
+ onRefresh(e) {
+ this.isTriggered = true;
},
onScrollBottom(e) {
this.storeMerchantList();
},
+ onAllCategory() {
+ this.$refs.popup.open();
+ },
+
onScroll(e) {
- if (this.scrollTop >= e.target.scrollTop) { //上拉
+ if (this.scrollTop > e.target.scrollTop) { //上拉
this.wrapHeight = 300;
} else {
this.wrapHeight = 0;
@@ -299,13 +303,13 @@
if (this.isLoading == -1) return;
this.isLoading = 1;
storeMerchantList(this.where).then(res => {
- uni.stopPullDownRefresh();
+ this.isTriggered = false;
this.goodsList = [...this.goodsList, ...res.data.list];
this.isLoading = 0;
if (res.data.list.length < this.where.limit) this.isLoading = -1;
this.where.page++;
}).catch(() => {
- uni.stopPullDownRefresh();
+ this.isTriggered = false;
})
},
closeShowAddress() {
@@ -683,7 +687,6 @@
.score-title {
margin-right: 15rpx;
-
}
.score_text {
diff --git a/pages/cloud_warehouse/specialty/specialty.vue b/pages/cloud_warehouse/specialty/specialty.vue
index 385fe77..144dda0 100644
--- a/pages/cloud_warehouse/specialty/specialty.vue
+++ b/pages/cloud_warehouse/specialty/specialty.vue
@@ -65,11 +65,12 @@
+ :refresher-enabled="true" :refresher-triggered="isTriggered" @refresherpulling="onPulling"
+ @refresherrefresh="onRefresh" :refresher-threshold="45" :scroll-anchoring='true'>
-
+
@@ -132,36 +133,38 @@
},
wrapHeight: 300,
scrollTop: 0,
+ isTriggered: true
}
},
onLoad(option) {
this.getCategoryIndexList();
this.getProductslist(true);
},
- onReachBottom() {
- // this.getProductslist();
- },
onPageScroll() {
uni.$emit('scroll');
},
- onPullDownRefresh() {
- // this.getProductslist(true);
- },
methods: {
- onAllCategory() {
- this.$refs.popup.open();
+ // 下拉加载
+ onPulling() {
+ if (!this.isTriggered) {
+ this.isTriggered = true;
+ this.getProductslist(true);
+ }
},
-
- scrolltoupper() {
- this.getProductslist(true);
+ onRefresh(e) {
+ this.isTriggered = true;
},
onScrollBottom(e) {
this.getProductslist();
},
+ onAllCategory() {
+ this.$refs.popup.open();
+ },
+
onScroll(e) {
- if (this.scrollTop >= e.target.scrollTop) { //上拉
+ if (this.scrollTop > e.target.scrollTop) { //上拉
this.wrapHeight = 300;
} else {
this.wrapHeight = 0;
@@ -182,6 +185,7 @@
}
})
},
+
navBack() {
uni.navigateBack();
},
@@ -202,6 +206,7 @@
this.$refs.popup && this.$refs.popup.close();
this.$forceUpdate();
},
+
changeChildrenCate(e) {
this.cate_change_children = e;
this.where.cate_pid = this.store_category_children[e].store_category_id;
@@ -236,13 +241,13 @@
if (this.isLoading == -1) return;
this.isLoading = 1;
getProductslist(this.where).then(res => {
- uni.stopPullDownRefresh();
+ this.isTriggered = false;
this.hostProduct = [...this.hostProduct, ...res.data.list];
this.where.page++;
this.isLoading = 0;
if (res.data.list.length < this.where.limit) this.isLoading = -1;
}).catch(() => {
- uni.stopPullDownRefresh();
+ this.isTriggered = false;
})
},
goDetail(item) {
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 6abd3ff..dfae325 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -140,7 +140,8 @@
+ :refresher-enabled="true" :refresher-triggered="isTriggered" @refresherpulling="onPulling"
+ @refresherrefresh="onRefresh" :refresher-threshold="45" :scroll-anchoring='true'>
@@ -195,7 +196,7 @@
+ style="background-color: #fff;padding: 12rpx 0;">
@@ -323,6 +324,7 @@
wrapHeight: 332,
isShowSmall: false,
scrollTop: 0,
+ isTriggered: false
}
},
computed: {
@@ -368,12 +370,6 @@
})
}
},
- // onPullDownRefresh() {
- // this.initData(true, true);
- // },
- // onReachBottom() {
- // this.initData(false, true);
- // },
watch: {
'where.cate_pid'(newVal, oldVal) {
@@ -389,18 +385,26 @@
},
methods: {
- onAllCategory() {
- this.$refs.popup.open();
- },
- scrolltoupper() {
- this.initData(true, true);
+ // 下拉加载
+ onPulling() {
+ if (!this.isTriggered) {
+ this.isTriggered = true;
+ this.initData(true, true);
+ }
+ },
+ onRefresh(e) {
+ this.isTriggered = true;
},
onScrollBottom(e) {
this.initData(false, true);
},
+ onAllCategory() {
+ this.$refs.popup.open();
+ },
+
onScroll(e) {
if (this.scrollTop >= e.target.scrollTop) { //上拉
this.wrapHeight = this.tabsCurr == 2 ? 400 : 332;
@@ -563,7 +567,7 @@
getProductslist(this.where, true).then(res => {
this.where.limit = res.data.limit
this.where.page = res.data.page
- if (stop) uni.stopPullDownRefresh();
+ this.isTriggered = false;
if (reLoad) this.hostProduct = [];
this.hostProduct = [...this.hostProduct, ...res.data.list];
this.isLoading = 0;
@@ -580,7 +584,7 @@
if (this.isLoading == -1) return;
this.isLoading = 1;
storeMerchantList(this.where).then(res => {
- if (stop) uni.stopPullDownRefresh()
+ this.isTriggered = false;
this.shopList = [...this.shopList, ...res.data.list];
this.isLoading = 0;
if (res.data.list.length < this.where.limit) this.isLoading = -1;