diff --git a/images/mine/ic_dangbiaoqian.png b/images/mine/ic_dangbiaoqian.png
index 4103137..f2997d4 100644
Binary files a/images/mine/ic_dangbiaoqian.png and b/images/mine/ic_dangbiaoqian.png differ
diff --git a/pages/heartNew/components/volunteer/volunteer.wxml b/pages/heartNew/components/volunteer/volunteer.wxml
index 93d9683..c1773ff 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxml
+++ b/pages/heartNew/components/volunteer/volunteer.wxml
@@ -1,6 +1,6 @@
-
- {{volunteerItemObj.nickname}}
+
+ {{volunteerItemObj.nickname}}
{{volunteerItemObj.volunteerSignature}}
\ No newline at end of file
diff --git a/pages/heartNew/components/volunteer/volunteer.wxss b/pages/heartNew/components/volunteer/volunteer.wxss
index 8975c93..9d35e44 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxss
+++ b/pages/heartNew/components/volunteer/volunteer.wxss
@@ -10,7 +10,7 @@
align-items: center;
}
-.item image {
+.item .faceImg {
width: 110rpx;
height: 110rpx;
border-radius: 50%;
@@ -22,6 +22,13 @@
font-size: 30rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
+ display: flex;
+ align-items: center;
+}
+.item .name image {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 10rpx;
}
.item .autograph {
diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index 30652fb..a3c129d 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -53,7 +53,7 @@ Page({
btnLeft: 0,
shouye: {},
scanBtn: {}, // 扫码签到改为可配置
- // applyBtn: {}, // 申请发单按钮改为可配置,
+ applyBtn: {}, // 申请发单按钮改为可配置,
},
/**
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index a9ccf00..7bea906 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -116,7 +116,7 @@
-
+ bindmovebtnCallBack="myApply">
- {{topicObj.nickname}}
+ {{topicObj.nickname}}
{{topicObj.createdTime}}
diff --git a/pages/mine/components/topicItemNew/topicItemNew.wxss b/pages/mine/components/topicItemNew/topicItemNew.wxss
index e298182..bc791b3 100644
--- a/pages/mine/components/topicItemNew/topicItemNew.wxss
+++ b/pages/mine/components/topicItemNew/topicItemNew.wxss
@@ -30,8 +30,14 @@
font-size: 28rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
+ display: flex;
+ align-items: center;
+}
+.user-info .name-date .name image {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 10rpx;
}
-
.user-info .name-date .date {
font-size: 20rpx;
font-weight: 500;
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index ec3fd5e..11f1b4c 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -10,11 +10,14 @@
- {{userInfo.nickname}}
-
+
+ {{userInfo.nickname}}
+
+
+
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 12173c3..80458fd 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -92,6 +92,8 @@ page {
.personal-info .box .content .top .right .nickname {
font-size: 30rpx;
color: #fff;
+ display: flex;
+ align-items: center;
}
.personal-info .box .content .top .right .party-flag {
width: 72rpx;
@@ -103,6 +105,11 @@ page {
align-items: center;
margin-top: 10rpx;
}
+.personal-info .box .content .top .right .dangbiao {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 8rpx;
+}
.personal-info .box .content .top .right .party-flag view {
color: #FD1D11;
font-size: 18rpx;
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 2baee7d..1c10973 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.6.42"
+ const versionNum = "1.7.1"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag
diff --git a/subpages/association/images/ic_dangbiaoqian.png b/subpages/association/images/ic_dangbiaoqian.png
index 4103137..f2997d4 100644
Binary files a/subpages/association/images/ic_dangbiaoqian.png and b/subpages/association/images/ic_dangbiaoqian.png differ
diff --git a/subpages/association/pages/topicDetail/topicDetail.wxml b/subpages/association/pages/topicDetail/topicDetail.wxml
index 197163f..d02dd7a 100644
--- a/subpages/association/pages/topicDetail/topicDetail.wxml
+++ b/subpages/association/pages/topicDetail/topicDetail.wxml
@@ -63,7 +63,7 @@
{{detailInfo.nickname}}
-
+
{{detailInfo.createdTime}}
diff --git a/subpages/associationNew/components/membersList/membersList.wxml b/subpages/associationNew/components/membersList/membersList.wxml
index e0a985b..e010bdc 100644
--- a/subpages/associationNew/components/membersList/membersList.wxml
+++ b/subpages/associationNew/components/membersList/membersList.wxml
@@ -9,6 +9,7 @@
{{item.nickname}}
+
diff --git a/subpages/associationNew/components/membersList/membersList.wxss b/subpages/associationNew/components/membersList/membersList.wxss
index aa0ca4f..8bff0a3 100644
--- a/subpages/associationNew/components/membersList/membersList.wxss
+++ b/subpages/associationNew/components/membersList/membersList.wxss
@@ -37,6 +37,9 @@
height: 28rpx;
margin-left: 8rpx;
}
+.members-item .item-top .dangbiao {
+ width: 28rpx;
+}
.members-item .item-top .identity0{
width: 59rpx;
}
diff --git a/subpages/associationNew/components/membersListNew/membersListNew.wxml b/subpages/associationNew/components/membersListNew/membersListNew.wxml
index f03485d..c3d4fbc 100644
--- a/subpages/associationNew/components/membersListNew/membersListNew.wxml
+++ b/subpages/associationNew/components/membersListNew/membersListNew.wxml
@@ -3,7 +3,7 @@
- {{item.name}}
+ {{item.name}}
格言：{{item.motto}}
@@ -26,7 +26,7 @@
- {{item.name}}
+ {{item.name}}
格言：{{item.motto}}
diff --git a/subpages/associationNew/components/membersListNew/membersListNew.wxss b/subpages/associationNew/components/membersListNew/membersListNew.wxss
index 87fc1b8..8da59fc 100644
--- a/subpages/associationNew/components/membersListNew/membersListNew.wxss
+++ b/subpages/associationNew/components/membersListNew/membersListNew.wxss
@@ -23,8 +23,14 @@
line-height: 30rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
+ display: flex;
+ align-items: center;
+}
+.item .name image {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 10rpx;
}
-
.item .autograph-all {
margin-top: 13rpx;
width: 100%;
diff --git a/subpages/associationNew/images/ic_dangbiaoqian.png b/subpages/associationNew/images/ic_dangbiaoqian.png
new file mode 100644
index 0000000..f2997d4
Binary files /dev/null and b/subpages/associationNew/images/ic_dangbiaoqian.png differ
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml
index 876dc0b..910e0c7 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxml
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxml
@@ -4,9 +4,11 @@
-
+
- {{item.nickname}}
+
+ {{item.nickname}}
+
@@ -82,7 +84,7 @@
-
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss
index 220c042..a9278b7 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxss
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxss
@@ -12,12 +12,12 @@ page {
.user-info {
/* width: calc(100% - 58rpx); */
- height: 64rpx;
+ /* height: 64rpx; */
display: flex;
align-items: center;
}
-.user-info image {
+.user-info .head-logo {
border-radius: 50rpx;
width: 64rpx;
height: 64rpx;
@@ -34,8 +34,7 @@ page {
font-size: 28rpx;
/* font-weight: bold; */
color: rgba(51, 51, 51, 1);
- display: flex;
- align-items: center;
+ width: 600rpx;
}
.user-info .name-date .community-logo {
@@ -51,6 +50,11 @@ page {
margin-left: 8rpx;
border-radius: 0px;
}
+.user-info .name-date .dang-logo {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 8rpx;
+}
.user-info .name-date .date {
font-size: 20rpx;
font-weight: 500;
diff --git a/subpages/discussion/images/ic_dangbiaoqian.png b/subpages/discussion/images/ic_dangbiaoqian.png
index 4103137..f2997d4 100644
Binary files a/subpages/discussion/images/ic_dangbiaoqian.png and b/subpages/discussion/images/ic_dangbiaoqian.png differ
diff --git a/subpages/heart/images/ic_dangbiaoqian.png b/subpages/heart/images/ic_dangbiaoqian.png
new file mode 100644
index 0000000..f2997d4
Binary files /dev/null and b/subpages/heart/images/ic_dangbiaoqian.png differ
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
index 63b17df..af153c2 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
@@ -49,6 +49,7 @@ Page({
onTabChange (e) {
this.setData({
selectTab: e.currentTarget.dataset.tab,
+ pageNo: 1
})
if (e.currentTarget.dataset.tab == "tab2") {
@@ -59,6 +60,7 @@ Page({
} else {
this.setData({
jilu: true,
+ loveRankingList: [],
})
this.loadLoveRanking()
}
@@ -100,24 +102,30 @@ Page({
// 加载 爱心互助排行榜
loadLoveRanking () {
this.setData({
- loveRankingList: [],
+ // loveRankingList: [],
preloadVisible: true
})
- api.leaderboard().then(res => {
+ const para = {
+ pageIndex: this.data.pageNo,
+ pageSize: this.data.pageSize
+ }
+ api.leaderboard(para).then(res => {
this.setData({
datalenght: res.data.length
})
- res.data.forEach((item) => {
- this.data.loveRankingList.push(item)
- })
+ // res.data.forEach((item) => {
+ // this.data.loveRankingList.push(item)
+ // })
this.setData({
- loveRankingList: this.data.loveRankingList,
+ 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
})
})
@@ -182,16 +190,18 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
- if(this.data.selectTab == "tab2"){
+ this.setData({
+ loadMoreVisible: true
+ })
+ if (this.data.loadMoreType === "loading") {
this.setData({
- loadMoreVisible: true
+ pageNo: this.data.pageNo + 1
})
- if (this.data.loadMoreType === "loading") {
- this.setData({
- pageNo: this.data.pageNo + 1
- })
- this.getSignedList()
- }
+ }
+ if(this.data.selectTab == "tab2"){
+ this.getSignedList()
+ } else {
+ this.loadLoveRanking()
}
},
// 列表 下拉刷新, 初始化加载
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index e3d1969..e0ad357 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -27,7 +27,7 @@
{{index + 1}}
- {{item.nickname}}
+ {{item.nickname}}
爱心时长 {{item.kindnessTime}}小时
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index 67a7db2..d0db4bd 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -171,6 +171,13 @@ button::after {
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
+ display: flex;
+ align-items: center;
+}
+.bottom .list-item .info .name image {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 10rpx;
}
.bottom .list-item .info .info-detail {
diff --git a/subpages/mine/images/ic_dangbiaoqian.png b/subpages/mine/images/ic_dangbiaoqian.png
index 4103137..f2997d4 100644
Binary files a/subpages/mine/images/ic_dangbiaoqian.png and b/subpages/mine/images/ic_dangbiaoqian.png differ
diff --git a/utils/api.js b/utils/api.js
index ae44b25..59ae85b 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -333,8 +333,11 @@ function userPointsRankinglist ({
/**
* 排行榜
*/
-function leaderboard () {
- return fly.get("heart/volunteer/leaderboard")
+function leaderboard ({pageIndex, pageSize}) {
+ return fly.get("heart/volunteer/leaderboard", {
+ pageIndex,
+ pageSize
+ })
}
/**
* 活动详情
diff --git a/utils/config.js b/utils/config.js
index 836194a..37bf49a 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -8,7 +8,7 @@ module.exports = {
function BASEURL() {
// return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境
return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
- // return 'http://10.10.10.91:9094/epdc-api/api/'
+ // return 'http://192.168.43.49:9094/epdc-api/api/'
// return 'https://nei.netease.com/api/apimock-v2/068b11343b2a993a9292d11f4b3fa8a8/api/'
}
diff --git a/utils/heartBehavior.js b/utils/heartBehavior.js
index 1d55407..6c84cac 100644
--- a/utils/heartBehavior.js
+++ b/utils/heartBehavior.js
@@ -84,9 +84,10 @@ module.exports = Behavior ({
scanBtn: item
})
} else if (item.imgType == '9') {
- this.data.tabList.push(item)
+ // this.data.tabList.push(item)
this.setData({
- tabList: this.data.tabList
+ // tabList: this.data.tabList
+ applyBtn: item
})
}
})