From 39903845165c19289382de2fe27ca5e240d8a96b Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 2 Jun 2020 16:13:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/heart/pages/leaderboardNew/leaderboardNew.wxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml index 1cdc9f0..10b559f 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml @@ -1,6 +1,6 @@ - 排行榜 + 志愿者银行 参与记录 From c58073372d17cf88dfc5b029dc741e6d173244c6 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 2 Jun 2020 16:42:12 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=81=AB=E7=81=AB?= =?UTF-8?q?=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/leaderboardNew/leaderboardNew.js | 23 ++++++++++++++++++- .../pages/leaderboardNew/leaderboardNew.wxml | 6 ++++- .../pages/leaderboardNew/leaderboardNew.wxss | 13 +++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js index 6e98c0b..9a4250e 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,29 @@ Page({ */ onLoad: function (options) { this.loadLoveRanking() + this.bannerListV2() this.setData({ timestamp: getTimestamp(), }) }, + bannerListV2: function () { + let that = this + api_banner.bannerList().then(function (res) { + that.setData({ + banner: res.data + }) + console.log('?'+JSON.stringify(that.data.banner)) + }) + }, + 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({ diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml index 10b559f..ccc5361 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml @@ -1,4 +1,8 @@ - + + 志愿者银行 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 From 8764e828471d949fbc5bd27a98f0729e402cfb91 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 3 Jun 2020 14:39:59 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/activity/activity.js | 6 +- components/activity/activity.wxml | 1 + .../components/volunteer/volunteer.js | 11 +- .../components/volunteer/volunteer.wxml | 2 +- pages/heartNew/heartNew.js | 22 ++- pages/heartNew/heartNew.wxss | 4 +- .../heart/pages/heartDetail/heartDetail.js | 8 +- .../heart/pages/heartDetail/heartDetail.wxml | 154 +++++++++++------- .../heart/pages/heartDetail/heartDetail.wxss | 14 +- 9 files changed, 145 insertions(+), 77 deletions(-) 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..e5abc46 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({ /** * 组件的属性列表 @@ -21,6 +22,12 @@ Component({ * 组件的方法列表 */ methods: { - - } + preViewImage(e) { + console.log(JSON.stringify(e)) + 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..edd6153 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -52,7 +52,8 @@ Page({ pageSize: this.data.pageSize, timestamp: getTimestamp(), actType: 0, - qkdat: true + qkdat: true, + selectedTab:this.data.selectedTab } this.selectComponent("#state-0").getActivityList(parms) }, @@ -106,7 +107,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 +122,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 +133,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 +159,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 +169,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) } @@ -279,7 +283,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 +304,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.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/subpages/heart/pages/heartDetail/heartDetail.js b/subpages/heart/pages/heartDetail/heartDetail.js index 92e774d..c04fcbc 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,15 @@ Page({ uservolunteerflag: '', cancelSignupVisible: false, cancelSignupTipValue: '', - cancelSignupTipVisible: false + cancelSignupTipVisible: false, + selectedTab:'',//用来判断详情是否显示志愿者打卡 }, onLoad: function(options) { this.setData({ id: options.id, actCurrentState: options.actcurrentstate, - signupFlag: options.signupflag + signupFlag: options.signupflag, + selectedTab:options.selectedTab, }) // this.getDetail();//活动详情 // this.clockList();//打卡列表 @@ -42,6 +45,7 @@ Page({ this.setData({ detail: res.data, actContent: res.data.actContent.replace(/\{{detail.title}} - + + + @@ -91,7 +93,7 @@ - + @@ -111,8 +113,9 @@ 3. 专业不限，具有美术教育者优先。 --> - - + + @@ -124,74 +127,102 @@ - - - - - - - 志愿者打卡 - - - {{clockNum}}次 - - + + + + + - - - - - - - {{item.nickname}} - {{item.createdTime}} + + --> + + + + + + + + + + + + + + + 志愿者打卡 - - {{item.clockDesc}} + + {{clockNum}}次 - + + + - - - - - - - + + + + + + + + {{item.nickname}} + {{item.createdTime}} + + + {{item.clockDesc}} + + - - - + --> + + + + + + + + + + + + + + + + + + - + + - - - + - - - - + + + + + - + - + 已报名 {{detail.signupNum}}人 @@ -257,7 +288,8 @@ - + 我要打卡 更新打卡 @@ -266,8 +298,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..dc79851 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%; } @@ -143,6 +146,7 @@ font-weight: 500; color: rgba(51, 51, 51, 1); line-height: 54rpx; + word-break: break-all; } .bottom { @@ -231,7 +235,6 @@ color: rgba(153, 153, 153, 1); margin-top: 10rpx; } - .info-box-volunteer { width: 100wh; height: auto; @@ -239,6 +242,9 @@ padding: 26rpx 0rpx; margin: 0rpx 22rpx; } +.info-box-volunteer:last-child { + border: none; +} .info-box-volunteer-last { width: 100wh; @@ -343,3 +349,9 @@ margin-left: 1%; border-radius: 15rpx; } +/* rich-text{ + white-space:normal; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} */ From b49ea1d9408efd51e5843e4d9ffdd54f0860113b Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 3 Jun 2020 15:09:34 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/mine.js | 8 +++++++- pages/mine/mine.wxml | 3 ++- pages/mine/mine.wxss | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) 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; } From cb15cc8dc6eceb0779d8e0d85fe6f3f233ebe996 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 3 Jun 2020 16:42:29 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heart/pages/heartDetail/heartDetail.js | 2 + .../heart/pages/heartDetail/heartDetail.json | 1 + .../heart/pages/heartDetail/heartDetail.wxml | 207 ++++++++---------- .../heart/pages/heartDetail/heartDetail.wxss | 28 ++- .../preloadDetailItem/preloadDetailItem.js | 23 ++ .../preloadDetailItem/preloadDetailItem.json | 4 + .../preloadDetailItem/preloadDetailItem.wxml | 35 +++ .../preloadDetailItem/preloadDetailItem.wxss | 84 +++++++ 8 files changed, 261 insertions(+), 123 deletions(-) create mode 100644 subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js create mode 100644 subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json create mode 100644 subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml create mode 100644 subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss diff --git a/subpages/heart/pages/heartDetail/heartDetail.js b/subpages/heart/pages/heartDetail/heartDetail.js index c04fcbc..9cdfce9 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.js +++ b/subpages/heart/pages/heartDetail/heartDetail.js @@ -23,6 +23,7 @@ Page({ cancelSignupTipValue: '', cancelSignupTipVisible: false, selectedTab:'',//用来判断详情是否显示志愿者打卡 + preloadVisible: true, }, onLoad: function(options) { this.setData({ @@ -49,6 +50,7 @@ Page({ actStartTime: res.data.actStartTime.substring(0, 16), actEndTime: res.data.actEndTime.substring(0, 16), signupEndTime: res.data.signupEndTime.substring(0, 16), + preloadVisible:false }) } }).catch(err => { diff --git a/subpages/heart/pages/heartDetail/heartDetail.json b/subpages/heart/pages/heartDetail/heartDetail.json index c20e21a..0a5a32d 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 bfde797..0641639 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.wxml +++ b/subpages/heart/pages/heartDetail/heartDetail.wxml @@ -1,5 +1,6 @@ - + + @@ -8,141 +9,121 @@ - - - - - - 报名截止时间 - - - {{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}} - - - + + - - 3. 专业不限，具有美术教育者优先。 - --> - - + - - - - 活动详情 + class="require {{detail.currentUserStatus == 0||detail.currentUserStatus == 1||detail.currentUserStatus == 2||detail.currentUserStatus == 3? 'margin-bottom':''}}"> + + + + 活动详情 + + + + - - - - - - - - - - @@ -159,7 +140,6 @@ {{clockNum}}次 - @@ -205,7 +185,6 @@ - diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxss b/subpages/heart/pages/heartDetail/heartDetail.wxss index dc79851..f7bc4d8 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.wxss +++ b/subpages/heart/pages/heartDetail/heartDetail.wxss @@ -50,6 +50,8 @@ page{ border-bottom: 1rpx solid #e7eeee; padding: 20rpx 0rpx; margin: 0rpx 20rpx; + display: flex; + justify-content: space-between; } .info-box-title { @@ -58,6 +60,8 @@ page{ border-bottom: 1rpx solid #e7eeee; padding: 35rpx 0rpx; margin: 0rpx 20rpx; + display: flex; + justify-content: space-between; } .display-inline { @@ -66,18 +70,20 @@ page{ .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 { @@ -88,16 +94,18 @@ page{ .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 { @@ -105,6 +113,8 @@ page{ height: auto; padding: 25rpx 0rpx; margin: 0rpx 20rpx; + display: flex; + justify-content: space-between; } .clear { 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 From 341b0a182f4a7c1f8263475191ca3bc05bfdd218 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 3 Jun 2020 17:22:54 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/volunteer/volunteer.js | 4 +- pages/heartNew/heartNew.js | 41 +++++++++++++------ pages/heartNew/heartNew.wxml | 2 +- .../pages/leaderboardNew/leaderboardNew.js | 11 ++--- utils/activity.js | 4 +- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/pages/heartNew/components/volunteer/volunteer.js b/pages/heartNew/components/volunteer/volunteer.js index e5abc46..e18523e 100644 --- a/pages/heartNew/components/volunteer/volunteer.js +++ b/pages/heartNew/components/volunteer/volunteer.js @@ -15,7 +15,7 @@ Component({ * 组件的初始数据 */ data: { - + ifclick:true }, /** @@ -23,7 +23,7 @@ Component({ */ methods: { preViewImage(e) { - console.log(JSON.stringify(e)) + this.triggerEvent('clickImage', this.data.ifclick) wx.previewImage({ urls: [e.currentTarget.dataset.src], current: e.currentTarget.dataset.src diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index edd6153..396e025 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，所以加这个字段进行控制 }, /** @@ -68,23 +69,30 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + console.log(':::::::::') 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({ + 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.updateActivityList() @@ -221,6 +229,12 @@ Page({ }) }, + clickImage(e){ + this.setData({ + ifClickImage: e.detail, + }) + }, + /** * 生命周期函数--监听页面隐藏 @@ -244,7 +258,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 }) 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/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js index 9a4250e..b83d918 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js @@ -76,11 +76,13 @@ Page({ }, bannerListV2: function () { let that = this - api_banner.bannerList().then(function (res) { + let params = { + bannerType:"2" + } + api_banner.bannerList(params).then(function (res) { that.setData({ banner: res.data }) - console.log('?'+JSON.stringify(that.data.banner)) }) }, preViewImage(e) { @@ -208,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', @@ -226,7 +228,6 @@ Page({ }, // 列表 上拉加载 getSignedList() { - console.log('+++++++++++++++++++++++++') const para = { pageIndex: this.data.pageNo, pageSize: this.data.pageSize, @@ -234,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/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() { From 07809bbcbff1b0c029f454e85d19a7ba8a8a4118 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 3 Jun 2020 17:38:03 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/heartNew/heartNew.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index 396e025..18e7c34 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -69,18 +69,17 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - console.log(':::::::::') - this.setData({ - loadMoreVisible: false, - loadMoreType: 'none', - indexPage: 1, - }) if(this.data.selectedTab == 'tab1'){//刷新志友 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, @@ -95,6 +94,11 @@ Page({ } } if (this.data.actId) { + this.setData({ + loadMoreVisible: false, + loadMoreType: 'none', + indexPage: 1, + }) this.updateActivityList() } }, From 49600fd62639444f2eb03fc71bdeb8d469254973 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Wed, 3 Jun 2020 19:07:09 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E7=89=88=E6=9C=AC1.2.1=20=E5=BF=97?= =?UTF-8?q?=E6=84=BF=E8=80=85=E5=8E=BB=E5=93=AA=E5=84=BF=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- subpages/heart/pages/heartDetail/heartDetail.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 374e3b2..f9fd1cb 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.1' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/heart/pages/heartDetail/heartDetail.json b/subpages/heart/pages/heartDetail/heartDetail.json index 0a5a32d..32c0231 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.json +++ b/subpages/heart/pages/heartDetail/heartDetail.json @@ -1,7 +1,7 @@ { "navigationBarTitleText": "详情", "usingComponents": { - "preload-detail-item": "../preloadDetailItem/preloadDetailItem", + "preload-detail-item": "./preloadDetailItem/preloadDetailItem", "wux-dialog": "../../../../dist/dialog/index", "coverview-dialog": "../../components/coverViewDialog/coverViewDialog", "cancel-signup-dialog": "../../components/cancelSignupDialog/cancelSignupDialog" From 1d18de445d7131078f981d83a0aab3f32aea83bc Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 4 Jun 2020 10:02:44 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/heart/pages/heartDetail/heartDetail.wxml | 1 + subpages/heart/pages/heartDetail/heartDetail.wxss | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxml b/subpages/heart/pages/heartDetail/heartDetail.wxml index 0641639..77bb63c 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.wxml +++ b/subpages/heart/pages/heartDetail/heartDetail.wxml @@ -185,6 +185,7 @@ + diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxss b/subpages/heart/pages/heartDetail/heartDetail.wxss index f7bc4d8..09fac88 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.wxss +++ b/subpages/heart/pages/heartDetail/heartDetail.wxss @@ -1,6 +1,7 @@ -page{ +page { background: #f7f7f7; } + .container { width: 100%; } @@ -245,6 +246,7 @@ page{ color: rgba(153, 153, 153, 1); margin-top: 10rpx; } + .info-box-volunteer { width: 100wh; height: auto; @@ -252,6 +254,7 @@ page{ padding: 26rpx 0rpx; margin: 0rpx 22rpx; } + .info-box-volunteer:last-child { border: none; } @@ -359,9 +362,7 @@ page{ margin-left: 1%; border-radius: 15rpx; } -/* rich-text{ - white-space:normal; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -} */ + +rich-text { + line-height: 75rpx; +} \ No newline at end of file From d8332ccd6c3fac698750d818a2481c9a0b42f804 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 4 Jun 2020 12:35:52 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heart/pages/heartDetail/heartDetail.js | 3 + .../heart/pages/heartDetail/heartDetail.wxml | 186 ++++++++++++------ .../heart/pages/heartDetail/heartDetail.wxss | 12 +- 3 files changed, 138 insertions(+), 63 deletions(-) diff --git a/subpages/heart/pages/heartDetail/heartDetail.js b/subpages/heart/pages/heartDetail/heartDetail.js index 9cdfce9..a72558a 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.js +++ b/subpages/heart/pages/heartDetail/heartDetail.js @@ -24,8 +24,10 @@ Page({ cancelSignupTipVisible: false, selectedTab:'',//用来判断详情是否显示志愿者打卡 preloadVisible: true, + timeJudge:false,//根据当前时间比较活动结束时间，判断活动是否已经结束，用以判断显示订单多多里面的志愿者 }, onLoad: function(options) { + console.log("当前时间"+getTimestamp()) this.setData({ id: options.id, actCurrentState: options.actcurrentstate, @@ -50,6 +52,7 @@ Page({ actStartTime: res.data.actStartTime.substring(0, 16), actEndTime: res.data.actEndTime.substring(0, 16), signupEndTime: res.data.signupEndTime.substring(0, 16), + timeJudge: getTimestamp() > res.data.actEndTime.substring(0, 16) ? true : false, preloadVisible:false }) } diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxml b/subpages/heart/pages/heartDetail/heartDetail.wxml index 77bb63c..909bf6c 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.wxml +++ b/subpages/heart/pages/heartDetail/heartDetail.wxml @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@ + class="require {{selectedTab == 'tab0' && detail.currentUserStatus != 6 && timeJudge ? 'margin-bottom' : ''}} {{detail.currentUserStatus == 0||detail.currentUserStatus == 1||detail.currentUserStatus == 2||detail.currentUserStatus == 3? 'margin-bottom':''}}"> @@ -128,74 +128,150 @@ - - - - - - - 志愿者打卡 - - - {{clockNum}}次 + + + + + + + + + + + 志愿者打卡 + + + {{clockNum}}次 + - - - - - - - - - {{item.nickname}} - {{item.createdTime}} + + + + + + + + {{item.nickname}} + {{item.createdTime}} + + + {{item.clockDesc}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 志愿者打卡 - - {{item.clockDesc}} + + {{clockNum}}次 - + - - - - - - - + + + + + + + + + {{item.nickname}} + {{item.createdTime}} + + + {{item.clockDesc}} + + - - - - + --> + + + + - + + + + + + + + + + + + + + + + - - - + - - - - + + + + + Date: Thu, 4 Jun 2020 13:32:12 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E7=89=88=E6=9C=AC1.2.2=201.2.1=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20=E5=BF=97=E6=84=BF=E8=80=85=E5=8E=BB=E5=93=AA?= =?UTF-8?q?=E5=84=BF=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index f9fd1cb..e69243d 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = '1.2.1' + const versionNum = '1.2.2' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag