From 171146ab2c6013b557e6969ea7961b127e0a94ce Mon Sep 17 00:00:00 2001
From: zhaotongyao <531131322@qq.com>
Date: Tue, 20 Jul 2021 13:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.7.5=20=E5=BF=97=E6=84=BF?=
=?UTF-8?q?=E8=80=85=E9=93=B6=E8=A1=8C=E5=A2=9E=E5=8A=A0=E5=85=AC=E7=9B=8A?=
=?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/toRegister/toRegister.js | 2 +-
.../pages/leaderboardNew/leaderboardNew.js | 39 ++++++++++++++
.../pages/leaderboardNew/leaderboardNew.wxml | 27 +++++++---
.../pages/leaderboardNew/leaderboardNew.wxss | 52 ++++++++++++++++---
utils/api.js | 7 ++-
5 files changed, 110 insertions(+), 17 deletions(-)
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 4bdff19..abfe8ca 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.7.4"
+ const versionNum = "1.7.5"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
index 7ce94d9..5587bf6 100755
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
@@ -57,6 +57,10 @@ Page({
{
id: '2',
label: '公益积分'
+ },
+ {
+ id: '3',
+ label: '公益积分记录'
}
]
},
@@ -117,6 +121,10 @@ Page({
},
// 加载 爱心互助排行榜
loadLoveRanking () {
+ if (this.data.rankId == '3') {
+ this.getCharityPoints()
+ return
+ }
this.setData({
// loveRankingList: [],
preloadVisible: true
@@ -317,4 +325,35 @@ Page({
})
this.loadLoveRanking()
},
+ // 加载 公益积分记录
+ getCharityPoints () {
+ this.setData({
+ // loveRankingList: [],
+ preloadVisible: true
+ })
+ const para = {
+ pageIndex: this.data.pageNo,
+ pageSize: this.data.pageSize
+ }
+ api.getCharityPoints(para).then(res => {
+ this.setData({
+ datalenght: res.data.length
+ })
+ // res.data.forEach((item) => {
+ // this.data.loveRankingList.push(item)
+ // })
+ this.setData({
+ loveRankingList: [ ...this.data.loveRankingList, ...res.data ],
+ loadMoreType: res.data.length === 10 ? "loading" : "none",
+ preloadVisible: false
+ })
+ }).catch(() => {
+ this.setData({
+ datalenght:0,
+ loveRankingList: [],
+ loadMoreType: "none",
+ preloadVisible: false
+ })
+ })
+ },
})
\ No newline at end of file
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index def85de..c43a647 100755
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -16,17 +16,17 @@
-
+
+
+ {{item.label}}
+
+
+
-
-
-
- {{item.label}}
-
-
+
{{index + 1}}
@@ -50,7 +50,18 @@
-
+
+
+ {{item.actName}}
+
+ {{item.operationTime}}
+
+ {{item.operationType == '0' ? '-' : '+'}}
+ {{item.volunteerPoints}}
+
+
+
+
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index d19b556..b6aa34f 100755
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -100,12 +100,12 @@ button::after {
.bottom {
width: 100%;
box-sizing: border-box;
- background: #f7f7f7;
+ background: #ffffff;
/* margin-top: 4rpx; */
/* padding: 0 30rpx; */
}
.padding{
- /* padding: 0 30rpx; */
+ padding: 0 30rpx;
}
@@ -125,12 +125,10 @@ button::after {
display: flex;
align-items: center;
background-color: #fff;
- box-sizing: border-box;
- padding: 0 30rpx;
}
.bottom .list-item+.list-item {
- border-top: 1rpx solid #e5e5e5;
+ border-top: 1px solid #e5e5e5;
}
.bottom .list-item .num {
@@ -297,12 +295,52 @@ button::after {
color: #333333;
min-width: 140rpx;
text-align: center;
- height: 52rpx;
- line-height: 52rpx;
+ height: 48rpx;
+ line-height: 48rpx;
}
.volunteer-tag .sel {
border: 1px solid #da433d;
background-color: #da433d;
color: #fff;
font-weight: bold;
+}
+.bottom .list-item-2 {
+ width: 100%;
+ height: 160rpx;
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-around;
+ background-color: #fff;
+ flex-direction: column;
+}
+
+.bottom .list-item-2+.list-item-2 {
+ border-top: 1px solid #e5e5e5;
+}
+.bottom .list-item-2 .act-title {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-wrap:break-word;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ display: -webkit-box;
+ font-size: 32rpx;
+}
+.bottom .list-item-2 .act-desc {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 28rpx;
+ color: #999;
+}
+.bottom .list-item-2 .act-desc .option {
+ display: flex;
+}
+.bottom .list-item-2 .act-desc .option-green {
+ color: #32a332;
+}
+.bottom .list-item-2 .act-desc .option-red {
+ color: #da433d;
}
\ No newline at end of file
diff --git a/utils/api.js b/utils/api.js
index 02b9dd2..dfa4cfd 100755
--- a/utils/api.js
+++ b/utils/api.js
@@ -72,7 +72,8 @@ module.exports = {
suggestDict: suggestDict,
suggestDictList: suggestDictList,
suggestDetail: suggestDetail,
- getVolunteerDepts: getVolunteerDepts
+ getVolunteerDepts: getVolunteerDepts,
+ getCharityPoints: getCharityPoints
}
function getToken (wxCode) {
@@ -632,4 +633,8 @@ function suggestDetail (id) {
//志愿者注册-志愿者部门列表
function getVolunteerDepts () {
return fly.get(`app-user/volunteer/depts`)
+}
+//志愿者银行-公益积分记录
+function getCharityPoints (para) {
+ return fly.get(`points/charityPoints`, para)
}
\ No newline at end of file