diff --git a/components/activity/activity.js b/components/activity/activity.js
index 0aff0dd..898a3d6 100644
--- a/components/activity/activity.js
+++ b/components/activity/activity.js
@@ -17,6 +17,9 @@ Component({
methods: {
getActivityList(params) {
let that = this
+ that.setData({
+ selectedTab: params.selectedTab
+ })
if (params.qkdat == true) {
console.log('清空')
that.setData({
@@ -45,6 +48,7 @@ Component({
},
toActDetail(e) {
+ console.log('selectedTab::::'+this.data.selectedTab)
const id = e.currentTarget.dataset.id
const actcurrentstate = e.currentTarget.dataset.actcurrentstate
const signupflag = e.currentTarget.dataset.signupflag
@@ -52,7 +56,7 @@ Component({
actId: id
})
wx.navigateTo({
- url: `/subpages/heart/pages/heartDetail/heartDetail?id=${id}&actcurrentstate=${actcurrentstate}&signupflag=${signupflag}`
+ url: `/subpages/heart/pages/heartDetail/heartDetail?id=${id}&actcurrentstate=${actcurrentstate}&signupflag=${signupflag}&selectedTab=${this.data.selectedTab}`
})
},
updateActivityList(params) {
diff --git a/components/activity/activity.wxml b/components/activity/activity.wxml
index 5902a09..901d62a 100644
--- a/components/activity/activity.wxml
+++ b/components/activity/activity.wxml
@@ -10,6 +10,7 @@
未开始
进行中
已结束
+ 已取消
{{item.title}}
diff --git a/pages/heartNew/components/volunteer/volunteer.js b/pages/heartNew/components/volunteer/volunteer.js
index bf3fb55..e18523e 100644
--- a/pages/heartNew/components/volunteer/volunteer.js
+++ b/pages/heartNew/components/volunteer/volunteer.js
@@ -1,4 +1,5 @@
// pages/indexNew/components/volunteer/volunteer.js
+const app = getApp()
Component({
/**
* 组件的属性列表
@@ -14,13 +15,19 @@ Component({
* 组件的初始数据
*/
data: {
-
+ ifclick:true
},
/**
* 组件的方法列表
*/
methods: {
-
- }
+ preViewImage(e) {
+ this.triggerEvent('clickImage', this.data.ifclick)
+ wx.previewImage({
+ urls: [e.currentTarget.dataset.src],
+ current: e.currentTarget.dataset.src
+ })
+ }
+ },
})
diff --git a/pages/heartNew/components/volunteer/volunteer.wxml b/pages/heartNew/components/volunteer/volunteer.wxml
index e495af4..93d9683 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxml
+++ b/pages/heartNew/components/volunteer/volunteer.wxml
@@ -1,5 +1,5 @@
-
+
{{volunteerItemObj.nickname}}
{{volunteerItemObj.volunteerSignature}}
diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index 46d9457..18e7c34 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -33,7 +33,8 @@ Page({
actId: '',//判断返回以后是否需要刷新列表
volunteerlist:[],//志愿者列表
listLength:0,//数据长度判断是否需要加载
- getImgUrl:''
+ getImgUrl:'',
+ ifClickImage:false,//因为志友多多点击图片查看大图,会出现列表刷新的bug,所以加这个字段进行控制
},
/**
@@ -52,7 +53,8 @@ Page({
pageSize: this.data.pageSize,
timestamp: getTimestamp(),
actType: 0,
- qkdat: true
+ qkdat: true,
+ selectedTab:this.data.selectedTab
}
this.selectComponent("#state-0").getActivityList(parms)
},
@@ -67,25 +69,36 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
- this.setData({
- loadMoreVisible: false,
- loadMoreType: 'none',
- indexPage: 1,
- })
if(this.data.selectedTab == 'tab1'){//刷新志友
- this.setData({
- dingdan: true,
- jingcai: true,
- volunteerlist:[],//列表置空
- listLength:0
- })
- let parms = {
- pageIndex: this.data.indexPage,
- pageSize: this.data.pageSize,
+ if(this.data.ifClickImage){//如果为true就不可以刷新,判断完成以后重新置为false
+ this.setData({
+ ifClickImage: false
+ })
+ }else{
+ this.setData({
+ loadMoreVisible: false,
+ loadMoreType: 'none',
+ indexPage: 1,
+ })
+ this.setData({
+ dingdan: true,
+ jingcai: true,
+ volunteerlist:[],//列表置空
+ listLength:0
+ })
+ let parms = {
+ pageIndex: this.data.indexPage,
+ pageSize: this.data.pageSize,
+ }
+ this.volunteerlist(parms)
}
- this.volunteerlist(parms)
}
if (this.data.actId) {
+ this.setData({
+ loadMoreVisible: false,
+ loadMoreType: 'none',
+ indexPage: 1,
+ })
this.updateActivityList()
}
},
@@ -106,7 +119,8 @@ Page({
pageSize: this.data.pageSize,
timestamp: getTimestamp(),
actType: 0,//活动列表类型(0-招募令,1-精彩活动)
- qkdat: true
+ qkdat: true,
+ selectedTab:e.currentTarget.dataset.tab
}
this.selectComponent("#state-0").getActivityList(parms)
} else if (e.currentTarget.dataset.tab == 'tab1') {
@@ -120,7 +134,6 @@ Page({
pageIndex: this.data.indexPage,
pageSize: this.data.pageSize,
}
- console.log('志愿者列表传值:'+JSON.stringify(parms))
this.volunteerlist(parms)
} else if (e.currentTarget.dataset.tab == 'tab2') {
this.setData({
@@ -132,7 +145,8 @@ Page({
pageSize: this.data.pageSize,
timestamp: getTimestamp(),
actType: 1,//活动列表类型(0-招募令,1-精彩活动)
- qkdat: true
+ qkdat: true,
+ selectedTab:e.currentTarget.dataset.tab
}
this.selectComponent("#state-2").getActivityList(parms)
} else if (e.currentTarget.dataset.tab == 'tab3') {
@@ -157,7 +171,8 @@ Page({
pageSize: 10,
timestamp: getTimestamp(),
actType: 0,
- actId: this.data.actId
+ actId: this.data.actId,
+ selectedTab:this.data.selectedTab
}
this.selectComponent("#state-0").updateActivityList(params)
} else if (this.data.selectedTab === 'tab2') {
@@ -166,7 +181,8 @@ Page({
pageSize: 10,
timestamp: getTimestamp(),
actType: 1,
- actId: this.data.actId
+ actId: this.data.actId,
+ selectedTab:this.data.selectedTab
}
this.selectComponent("#state-2").updateActivityList(params)
}
@@ -217,6 +233,12 @@ Page({
})
},
+ clickImage(e){
+ this.setData({
+ ifClickImage: e.detail,
+ })
+ },
+
/**
* 生命周期函数--监听页面隐藏
@@ -240,7 +262,10 @@ Page({
},
bannerListV2: function () {
let that = this
- api.bannerList().then(function (res) {
+ let params = {
+ bannerType:"0"
+ }
+ api.bannerList(params).then(function (res) {
that.setData({
banner: res.data
})
@@ -279,7 +304,8 @@ Page({
pageIndex: this.data.indexPage,
pageSize: this.data.pageSize,
timestamp: getTimestamp(),
- actType: 0
+ actType: 0,
+ selectedTab:this.data.selectedTab
}
this.selectComponent("#state-0").getActivityList(parms)
}else if(this.data.selectedTab == 'tab1'){
@@ -299,7 +325,8 @@ Page({
pageIndex: this.data.indexPage,
pageSize: this.data.pageSize,
timestamp: getTimestamp(),
- actType: 1
+ actType: 1,
+ selectedTab:this.data.selectedTab
}
this.selectComponent("#state-2").getActivityList(parms)
}
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index b5cfb34..56467d8 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -78,7 +78,7 @@
-
+
diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index 81aa21f..54b4b31 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -309,7 +309,7 @@ button:last-child {
}
.tab-bar .tab {
- font-size: 30rpx;
+ font-size: 34rpx;
font-weight: 500;
color: rgba(171, 171, 171, 1);
width: 25%;
@@ -322,7 +322,7 @@ button:last-child {
}
.tab-bar .tab.select {
- font-size: 32rpx;
+ font-size: 36rpx;
font-weight: bold;
color: rgba(229, 15, 0, 1);
}
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index 1d356d5..d051476 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -24,9 +24,15 @@ Page({
grade: 0
},
completeInfoDialogVisible: false,
- infoCompleted: 0
+ infoCompleted: 0,
+ changeName:false
},
onLoad() {
+ if(app.globalData.infoCompleted == 0 || app.globalData.infoCompleted == 4){//当状态为0 或者 4 的时候 显示完善个人信息其余状态为更改个人信息
+ this.setData({
+ changeName: true
+ })
+ }
this.getUserInfo()
this.setData({
infoCompleted: app.globalData.infoCompleted
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index 040a008..5cc42b7 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -20,7 +20,8 @@
- 完善信息
+ 完善个人信息
+ 更改个人信息
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 82a19a3..7b04f38 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -112,7 +112,7 @@ page {
object-fit: cover;
}
.personal-info .box .content .top .complete-info {
- width: 130rpx;
+ width: 190rpx;
height: 46rpx;
position: relative;
}
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 374e3b2..e69243d 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = '1.2.0'
+ const versionNum = '1.2.2'
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag
diff --git a/subpages/heart/pages/heartDetail/heartDetail.js b/subpages/heart/pages/heartDetail/heartDetail.js
index 92e774d..a72558a 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.js
+++ b/subpages/heart/pages/heartDetail/heartDetail.js
@@ -13,6 +13,7 @@ Page({
clocks: [], //打卡列表
clockNum: 0, //打卡人次
actContent: '', //富文本
+ actNewsContent:'',//新闻稿
dialogTitle: '',
dialogContent: '',
dialogConfirmText: '',
@@ -20,13 +21,18 @@ Page({
uservolunteerflag: '',
cancelSignupVisible: false,
cancelSignupTipValue: '',
- cancelSignupTipVisible: false
+ cancelSignupTipVisible: false,
+ selectedTab:'',//用来判断详情是否显示志愿者打卡
+ preloadVisible: true,
+ timeJudge:false,//根据当前时间比较活动结束时间,判断活动是否已经结束,用以判断显示订单多多里面的志愿者
},
onLoad: function(options) {
+ console.log("当前时间"+getTimestamp())
this.setData({
id: options.id,
actCurrentState: options.actcurrentstate,
- signupFlag: options.signupflag
+ signupFlag: options.signupflag,
+ selectedTab:options.selectedTab,
})
// this.getDetail();//活动详情
// this.clockList();//打卡列表
@@ -42,9 +48,12 @@ Page({
this.setData({
detail: res.data,
actContent: res.data.actContent.replace(/\
res.data.actEndTime.substring(0, 16) ? true : false,
+ preloadVisible:false
})
}
}).catch(err => {
diff --git a/subpages/heart/pages/heartDetail/heartDetail.json b/subpages/heart/pages/heartDetail/heartDetail.json
index c20e21a..32c0231 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.json
+++ b/subpages/heart/pages/heartDetail/heartDetail.json
@@ -1,6 +1,7 @@
{
"navigationBarTitleText": "详情",
"usingComponents": {
+ "preload-detail-item": "./preloadDetailItem/preloadDetailItem",
"wux-dialog": "../../../../dist/dialog/index",
"coverview-dialog": "../../components/coverViewDialog/coverViewDialog",
"cancel-signup-dialog": "../../components/cancelSignupDialog/cancelSignupDialog"
diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxml b/subpages/heart/pages/heartDetail/heartDetail.wxml
index 3b7b585..909bf6c 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.wxml
+++ b/subpages/heart/pages/heartDetail/heartDetail.wxml
@@ -1,197 +1,284 @@
-
+
+
{{detail.title}}
+
+
-
-
-
-
- 报名截止时间
-
-
- {{signupEndTime}}
-
-
-
-
-
-
- 活动时间
+
+
+
+
+ 报名截止时间
+
+
+ {{signupEndTime}}
+
-
- {{actStartTime}}至
- {{actEndTime}}
+
+
+
+ 活动时间
+
+
+ {{actStartTime}}至
+ {{actEndTime}}
+
-
-
-
-
-
- 活动地点
-
-
- {{detail.actAddress}}
+
+
+
+ 活动地点
+
+
+ {{detail.actAddress}}
+
-
-
-
-
-
- 活动名额
-
-
-
- 不限名额
-
-
- {{detail.actQuota}}人
+
+
+
+ 活动名额
+
+
+ 不限名额
+
+
+ {{detail.actQuota}}人
+
-
-
-
-
-
- 联系人
-
-
- {{detail.contacts}}
+
+
+
+ 联系人
+
+
+ {{detail.contacts}}
+
-
-
-
-
-
- 联系电话
-
-
- {{detail.tel}}
+
+
+
+ 联系电话
+
+
+ {{detail.tel}}
+
-
-
-
-
-
- 积分奖励
-
-
- {{detail.reward}}
+
+
+
+ 积分奖励
+
+
+ {{detail.reward}}
+
-
-
-
-
-
-
-
- 招募要求
+
+
+
+
+
+ 招募要求
+
-
-
-
- {{detail.requirement}}
-
-
-
-
-
-
-
-
-
- 活动详情
+
+ {{detail.requirement}}
+
-
-
-
-
+
-
-
-
-
+
+
-
- 志愿者打卡
+
+ 活动详情
-
- {{clockNum}}次
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 志愿者打卡
+
+
+ {{clockNum}}次
+
+
-
-
-
-
-
-
-
- {{item.nickname}}
- {{item.createdTime}}
-
-
- {{item.clockDesc}}
-
-
+
+
+
+
+
+
+
+ {{item.nickname}}
+ {{item.createdTime}}
+
+
+ {{item.clockDesc}}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 志愿者打卡
+
+
+ {{clockNum}}次
+
+
+
+
+
+
+
+
+
+ {{item.nickname}}
+ {{item.createdTime}}
+
+
+ {{item.clockDesc}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
已报名 {{detail.signupNum}}人
@@ -257,7 +344,8 @@
-
+
我要打卡
更新打卡
@@ -266,8 +354,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxss b/subpages/heart/pages/heartDetail/heartDetail.wxss
index 2a207db..0e8ec01 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.wxss
+++ b/subpages/heart/pages/heartDetail/heartDetail.wxss
@@ -1,3 +1,6 @@
+page{
+ background: #f7f7f7;
+}
.container {
width: 100%;
}
@@ -47,6 +50,8 @@
border-bottom: 1rpx solid #e7eeee;
padding: 20rpx 0rpx;
margin: 0rpx 20rpx;
+ display: flex;
+ justify-content: space-between;
}
.info-box-title {
@@ -55,6 +60,8 @@
border-bottom: 1rpx solid #e7eeee;
padding: 35rpx 0rpx;
margin: 0rpx 20rpx;
+ display: flex;
+ justify-content: space-between;
}
.display-inline {
@@ -63,18 +70,20 @@
.info-left {
width: 40%;
- float: left;
+ /* float: left; */
+ display: flex;
+ align-items: center;
word-wrap: break-word;
}
.info-right {
width: 60%;
- float: left;
+ /* float: left; */
font-size: 32rpx;
text-align: right;
word-wrap: break-word;
- position: relative;
- top: 5rpx;
+ /* position: relative;
+ top: 5rpx; */
}
.info-right .color {
@@ -85,16 +94,18 @@
.info-left image {
width: 34rpx;
height: 34rpx;
- position: relative;
- top: 5rpx;
+ /* position: relative; */
+ /* top: 5rpx; */
}
.info-font {
font-size: 32rpx;
+ line-height: 32rpx;
color: #999;
- padding: 5rpx;
- top: -4rpx;
- position: relative;
+ margin-left: 5rpx;
+ /* padding: 5rpx; */
+ /* top: -4rpx;
+ position: relative; */
}
.info-box-last {
@@ -102,6 +113,8 @@
height: auto;
padding: 25rpx 0rpx;
margin: 0rpx 20rpx;
+ display: flex;
+ justify-content: space-between;
}
.clear {
@@ -143,6 +156,7 @@
font-weight: 500;
color: rgba(51, 51, 51, 1);
line-height: 54rpx;
+ word-break: break-all;
}
.bottom {
@@ -231,7 +245,6 @@
color: rgba(153, 153, 153, 1);
margin-top: 10rpx;
}
-
.info-box-volunteer {
width: 100wh;
height: auto;
@@ -239,6 +252,9 @@
padding: 26rpx 0rpx;
margin: 0rpx 22rpx;
}
+.info-box-volunteer:last-child {
+ border: none;
+}
.info-box-volunteer-last {
width: 100wh;
@@ -343,3 +359,6 @@
margin-left: 1%;
border-radius: 15rpx;
}
+rich-text{
+line-height: 75rpx;
+}
diff --git a/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
new file mode 100644
index 0000000..eb4eb23
--- /dev/null
+++ b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
@@ -0,0 +1,23 @@
+// subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml
new file mode 100644
index 0000000..8107baf
--- /dev/null
+++ b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss
new file mode 100644
index 0000000..a308efc
--- /dev/null
+++ b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss
@@ -0,0 +1,84 @@
+page {
+ background: #f7f7f7;
+}
+
+.preload-project-item {
+ margin-top: 20rpx;
+ margin-left: 20rpx;
+ width: calc(100% - 40rpx);
+ background: #fff;
+ box-sizing: border-box;
+ border-radius: 16rpx;
+ padding: 0rpx 22rpx;
+ overflow: hidden;
+}
+
+.preload-project-item .item-list {
+ height: 100rpx;
+ width: 100%;
+ border-bottom: 1rpx solid #EAEAEA;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.preload-project-item .item-list:last-child {
+ border: none;
+}
+
+.preload-project-item .left {
+ height: 30rpx;
+ width: 190rpx;
+ border-radius: 8rpx;
+ background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
+ animation: loading 1.4s ease infinite;
+ background-size: 400% 100%;
+}
+
+.preload-project-item .right {
+ height: 30rpx;
+ width: 325rpx;
+ border-radius: 8rpx;
+ background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
+ animation: loading 1.4s ease infinite;
+ background-size: 400% 100%;
+}
+
+.item-list-last {
+ height: 100rpx;
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.bottom {
+ width: 100%;
+ height: 160rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.bottom .bottom-every {
+ width: 220rpx;
+ height: 160rpx;
+ border-radius: 8rpx;
+ background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
+ animation: loading 1.4s ease infinite;
+ background-size: 400% 100%;
+}
+
+.paddingBottom {
+ padding-bottom: 35rpx;
+}
+
+@keyframes loading {
+ 0% {
+ background-position: 100% 50%
+ }
+
+ 100% {
+ background-position: 0 50%
+ }
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
index 6e98c0b..b83d918 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
@@ -1,5 +1,6 @@
import { getTimestamp } from '../../../../utils/common'
const api = require('../../../../utils/api')
+var api_banner = require('../../../../utils/activity.js')
const app = getApp()
Page({
@@ -41,7 +42,8 @@ Page({
signedList: [],
timer: '',
timestamp: getTimestamp(),
- jilu: true
+ jilu: true,
+ banner:[]
},
// tab 切换
onTabChange(e) {
@@ -67,10 +69,31 @@ Page({
*/
onLoad: function (options) {
this.loadLoveRanking()
+ this.bannerListV2()
this.setData({
timestamp: getTimestamp(),
})
},
+ bannerListV2: function () {
+ let that = this
+ let params = {
+ bannerType:"2"
+ }
+ api_banner.bannerList(params).then(function (res) {
+ that.setData({
+ banner: res.data
+ })
+ })
+ },
+ preViewImage(e) {
+ let list = [];
+ list.push(this.data.banner[0].bannerImg)
+ list.push(this.data.banner[1].bannerImg)
+ wx.previewImage({
+ urls: list,
+ current: e.currentTarget.dataset.src
+ })
+ },
// 加载 爱心互助排行榜
loadLoveRanking() {
this.setData({
@@ -187,7 +210,7 @@ Page({
}
api.getSignedList(para).then(res => {
this.pullDownRefresh.stopRefresh()
- console.log('已报名活动', res)
+ // console.log('已报名活动', res)
this.setData({
signedList: [...res.data],
loadMoreType: res.data.length === 10 ? 'loading' : 'none',
@@ -205,7 +228,6 @@ Page({
},
// 列表 上拉加载
getSignedList() {
- console.log('+++++++++++++++++++++++++')
const para = {
pageIndex: this.data.pageNo,
pageSize: this.data.pageSize,
@@ -213,7 +235,7 @@ Page({
actType: this.data.selectedTab_B.substr(3, 1)
}
api.getSignedList(para).then(res => {
- console.log('已报名活动', res.data.length)
+ // console.log('已报名活动', res.data.length)
this.setData({
signedList: [...this.data.signedList, ...res.data],
loadMoreType: res.data.length === 10 ? 'loading' : 'none',
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index 1cdc9f0..ccc5361 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -1,6 +1,10 @@
-
+
+
+
+
+
- 排行榜
+ 志愿者银行
参与记录
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index d8896ab..953bd3b 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -3,6 +3,7 @@ page {
}
.tab-bar {
+ margin-top: 16rpx;
width: 100%;
height: 90rpx;
background: #fff;
@@ -235,4 +236,16 @@ button::after {
font-size: 30rpx;
color: #999;
background: #f7f7f7;
+ }
+ .banner{
+ width: 100%;
+ height: 500rpx;
+ background: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ }
+ .banner image{
+ width: 310rpx;
+ height: 440rpx;
}
\ No newline at end of file
diff --git a/utils/activity.js b/utils/activity.js
index 0cd039c..d15ba83 100644
--- a/utils/activity.js
+++ b/utils/activity.js
@@ -11,8 +11,8 @@ function getActivityList(params) {
return fly.get('heart/act/list', params)
}
-function bannerList() {
- return fly.get('heart/act/banner/list')
+function bannerList(params) {
+ return fly.get('heart/act/banner/list',params)
}
function bannerListV2() {