diff --git a/pages/heart/heart.js b/pages/heart/heart.js
index 3ea20bb..484575d 100644
--- a/pages/heart/heart.js
+++ b/pages/heart/heart.js
@@ -84,6 +84,18 @@ Page({
})
},
onReachBottom: function() {
+
+ if (this.data.listLength !== this.data.pageSize) {
+ this.setData({
+ loadMoreVisible: true,
+ loadMoreType: 'none',
+ })
+ } else {
+ this.setData({
+ loadMoreVisible: true,
+ loadMoreType: 'loading',
+ })
+ }
if (this.data.key == 'tab1') {
this.setData({
index: 0
@@ -125,6 +137,10 @@ Page({
})
},
onTabsChange(e) {
+ this.setData({
+ loadMoreVisible: false,
+ loadMoreType: 'none',
+ })
const {
key
} = e.detail
diff --git a/pages/heart/heart.json b/pages/heart/heart.json
index 02ae89e..bcd9170 100644
--- a/pages/heart/heart.json
+++ b/pages/heart/heart.json
@@ -4,7 +4,8 @@
"wux-tabs": "/dist/tabs/index",
"wux-tab": "/dist/tab/index",
"activity": "../../components/activity/activity",
- "load-more": "../../components/loadMore/loadMore"
+ "load-more": "../../components/loadMore/loadMore",
+ "no-data": "../../components/nodata/nodata"
},
"enablePullDownRefresh": true,
"backgroundColor": "#f8f8f8",
diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxml b/subpages/heart/pages/heartDetail/heartDetail.wxml
index 19c3d99..da2df66 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.wxml
+++ b/subpages/heart/pages/heartDetail/heartDetail.wxml
@@ -46,7 +46,7 @@
活动名额
-
+
{{ detail.actQuotaCategory === 0 ? '不限名额' : detail.actQuota + '人'}}
diff --git a/subpages/heart/pages/signed/signed.js b/subpages/heart/pages/signed/signed.js
index 60f8527..416a33f 100644
--- a/subpages/heart/pages/signed/signed.js
+++ b/subpages/heart/pages/signed/signed.js
@@ -21,6 +21,7 @@ Page({
this.getSignedList()
},
onShow () {
+ this.pulldownRefresh()
if (!app.globalData.previewImage) {
console.log('过滤previewImage引起的onShow')
}
diff --git a/subpages/heart/pages/volunteer/volunteer.js b/subpages/heart/pages/volunteer/volunteer.js
index 34615ea..7465ae6 100644
--- a/subpages/heart/pages/volunteer/volunteer.js
+++ b/subpages/heart/pages/volunteer/volunteer.js
@@ -112,7 +112,15 @@ Page({
encryptedData: e.detail.encryptedData,
iv: e.detail.iv
})
- this.submission()
+ if (e.detail.iv){
+ this.submission()
+ }else{
+ wx.showToast({
+ title: '您拒绝了获取信息,无法完成认证',
+ icon: 'none',
+ duration: 3000
+ })
+ }
},
// 拉取 用户信息
getPrepareComplete() {