From 17e81db5b795ba63d88bd150bb048d6f6d2f6a30 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 12 May 2020 16:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=89=93=E5=8D=A1?= =?UTF-8?q?=EF=BC=8C=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/mine.wxss | 1 + subpages/heart/pages/clockIn/clockIn.js | 2 +- subpages/heart/pages/clockIn/clockIn.wxml | 10 +- subpages/heart/pages/clockIn/clockIn.wxss | 111 +++++++++++-------- subpages/home/pages/info/info.js | 26 ++++- subpages/home/pages/info/info.wxml | 124 +++++++++++----------- subpages/home/pages/info/info.wxss | 3 + 7 files changed, 161 insertions(+), 116 deletions(-) diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 05a4fb6..82a19a3 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -1,6 +1,7 @@ page { width: 100%; height: 100vh; + background: #f7f7f7; } .mine { width: 100%; diff --git a/subpages/heart/pages/clockIn/clockIn.js b/subpages/heart/pages/clockIn/clockIn.js index e3b2c8b..d3a9c7c 100644 --- a/subpages/heart/pages/clockIn/clockIn.js +++ b/subpages/heart/pages/clockIn/clockIn.js @@ -251,7 +251,7 @@ Page({ } const params={ actId: this.data.id, - clockDesc: this.data.operationDesc, + clockDesc: this.data.operationDesc.substring(0, 500), clockLongitude: this.data.location.locationLongitude, clockLatitude: this.data.location.locationLatitude, clockAddress: this.data.operationAddress, diff --git a/subpages/heart/pages/clockIn/clockIn.wxml b/subpages/heart/pages/clockIn/clockIn.wxml index fb92da4..c3ba480 100644 --- a/subpages/heart/pages/clockIn/clockIn.wxml +++ b/subpages/heart/pages/clockIn/clockIn.wxml @@ -2,11 +2,11 @@ - - + + {{item.phrase}} diff --git a/subpages/heart/pages/clockIn/clockIn.wxss b/subpages/heart/pages/clockIn/clockIn.wxss index ecf6276..d7be3eb 100644 --- a/subpages/heart/pages/clockIn/clockIn.wxss +++ b/subpages/heart/pages/clockIn/clockIn.wxss @@ -1,66 +1,83 @@ -.container{ +.container { width: 100%; } -.info{ + +.info { background-color: #fff; border-radius: 20rpx; margin: 20rpx 20rpx 0rpx 20rpx; padding-bottom: 10rpx; } -textarea{ + +textarea { padding-top: 39rpx; width: calc(100% - 50rpx); margin-left: 25rpx; /* padding: 39rpx 25rpx 39rpx 25rpx; */ } -.info-tips{ + +.info-tips { width: 100%; height: auto; + display: flex; + flex-direction: column; + align-items: flex-start; } -.tips{ - background-color: #D9D9D9; + +.tips { + background-color: #d9d9d9; border-radius: 20rpx; margin: 20rpx 20rpx 0rpx 20rpx; - display:inline-block; + display: inline-block; padding: 8rpx 10rpx; } -.spot{ + +.spot { width: 14rpx; height: 14rpx; - background-color: #C1C1C1; + background-color: #c1c1c1; border-radius: 50%; position: relative; float: left; top: 10rpx; } -.display-inline{display:inline} -.content{ + +.display-inline { + display: inline; +} + +.content { float: left; - font-size:28rpx; - font-weight:500; + font-size: 28rpx; + font-weight: 500; margin-left: 10rpx; - color:rgba(102,102,102,1); + color: rgba(102, 102, 102, 1); } -.info-line{ + +.info-line { height: 3rpx; - background-color: #EAEAEA; + background-color: #eaeaea; width: 100whh; margin: 30rpx 24rpx 20rpx; } -.photo{ + +.photo { padding: 18rpx; } -.wux-upload--picture-card .wux-upload__select{ + +.wux-upload--picture-card .wux-upload__select { width: 220rpx !important; height: 220rpx !important; } -.wux-upload--picture-card .wux-upload__file{ + +.wux-upload--picture-card .wux-upload__file { width: 220rpx !important; height: 220rpx !important; - border: 2rpx solid #EAEAEA !important; + border: 2rpx solid #eaeaea !important; margin: 0 40rpx 40rpx 0 !important; } -.wux-upload--picture-card .wux-upload__remove{ + +.wux-upload--picture-card .wux-upload__remove { width: 46rpx !important; height: 46rpx !important; background-size: 46rpx auto !important; @@ -69,7 +86,8 @@ textarea{ } /* 定位 */ -.location{ + +.location { margin: 20rpx 20rpx 0rpx 20rpx; padding-bottom: 35rpx; margin-bottom: 14rpx; @@ -83,53 +101,54 @@ textarea{ border-bottom: 1rpx solid #e7eeee; padding: 35rpx 0rpx; margin: 0rpx 20rpx; - font-size:34rpx; - font-weight:bold; - color:rgba(51,51,51,1); + font-size: 34rpx; + font-weight: bold; + color: rgba(51, 51, 51, 1); } - -.info-box-last-require - { +.info-box-last-require { width: 100wh; height: auto; padding: 30rpx 0rpx 0 0; margin: 0rpx 20rpx; - font-size:34rpx; - font-weight:500; - color:rgba(51,51,51,1); - line-height:54rpx; + font-size: 34rpx; + font-weight: 500; + color: rgba(51, 51, 51, 1); + line-height: 54rpx; } -.refresh{ - margin: 30rpx 20rpx; + +.refresh { + margin: 30rpx 20rpx; } -.refresh image{ + +.refresh image { width: 30.3rpx; height: 30.3rpx; float: left; position: relative; - top: 5rpx + top: 5rpx; } -.refresh-name{ - font-size:28rpx; - font-weight:500; - color:rgba(0,179,152,1); + +.refresh-name { + font-size: 28rpx; + font-weight: 500; + color: rgba(0, 179, 152, 1); float: left; margin-left: 10rpx; } -.clear{ +.clear { clear: both; } -.button{ - background:linear-gradient(90deg,rgba(244,12,12,1),rgba(255,78,78,1)); +.button { + background: linear-gradient(90deg, rgba(244, 12, 12, 1), rgba(255, 78, 78, 1)); margin-left: 95rpx; width: 560rpx; height: 84rpx; - font-size:36rpx; - font-weight:500; - color:rgba(255,255,255,1); + font-size: 36rpx; + font-weight: 500; + color: rgba(255, 255, 255, 1); text-align: center; line-height: 84rpx; border-radius: 20rpx; diff --git a/subpages/home/pages/info/info.js b/subpages/home/pages/info/info.js index ac7157a..d4c659d 100644 --- a/subpages/home/pages/info/info.js +++ b/subpages/home/pages/info/info.js @@ -8,6 +8,7 @@ Page({ infoList: [] }, onShow() { + // 重置数据 this.setData({ pageNo: 1, infoList: [] @@ -40,9 +41,9 @@ Page({ }) }, lookDetail(e) { - console.log('item',e.currentTarget.dataset.item) + console.log('item', e.currentTarget.dataset.item) const { id: infoId, businessId: issueId, type, businessType, relBusinessContent } = e.currentTarget.dataset.item - console.log('businessType',businessType) + console.log('businessType', businessType) let params = { informationId: infoId } @@ -72,6 +73,19 @@ Page({ wx.navigateTo({ url: `/subpages/discussion/pages/discussionDetail/discussionDetail?detailId=${issueId}&type=project` }) + } else if (businessType.indexOf('act_sign_up_success') > -1) {//爱心互助活动报名成功 + wx.navigateTo({ + url: `/subpages/heart/pages/heartDetail/heartDetail?id=${issueId}` + }) + } else if (businessType.indexOf('act_sign_up_failure') > -1) {//爱心互助活动审核未通过 + console.log('ssss') + wx.navigateTo({ + url: `/subpages/heart/pages/refusedOrEndedDetail/refusedOrEndedDetail?id=${issueId}` + }) + } else if (businessType.indexOf('volunteer') > -1) {//志愿者认证 + wx.navigateTo({ + url: '/subpages/heart/pages/volunteer/volunteer' + }) } } else if (type === '1') { if (businessType === 'groupTopicClosed') { @@ -90,6 +104,14 @@ Page({ wx.navigateTo({ url: `/subpages/association/pages/topicDetail/topicDetail?detailId=${issueId}` }) + } else if (businessType.indexOf('activity') > -1) {//爱心互助详情 + wx.navigateTo({ + url: `/subpages/heart/pages/heartDetail/heartDetail?id=${issueId}` + }) + } else if (businessType.indexOf('act_cancel') > -1) {//爱心互助活动取消 + wx.navigateTo({ + url: `/subpages/heart/pages/cancelDetail/cancelDetail?id=${issueId}` + }) } } else if (type === '2') { if (businessType === 'topicToIssuePass') { diff --git a/subpages/home/pages/info/info.wxml b/subpages/home/pages/info/info.wxml index b0e100c..533c213 100644 --- a/subpages/home/pages/info/info.wxml +++ b/subpages/home/pages/info/info.wxml @@ -1,69 +1,69 @@ - - - - - - - 审核通知 - - - 查看详情 - - - {{item.title}} - {{item.time}} - {{item.content}} - + + + + + + + 审核通知 + - - - - - 互动通知 - - - 查看详情 - - - {{item.title}} - {{item.time}} - {{item.content}} - {{item.relBusinessContent}} - + 查看详情 + + + {{item.title}} + {{item.time}} + {{item.content}} + + + + + + + 互动通知 + - - - - - 社群通知 - - - 查看详情 - - - {{item.title}} - {{item.time}} - {{item.content}} - - + 查看详情 + + + {{item.title}} + {{item.time}} + {{item.content}} + {{item.relBusinessContent}} + + + + + + + 社群通知 + - - - - - 处理进展 - - - 查看详情 - - - {{item.title}} - {{item.time}} - {{item.content}} - + 查看详情 + + + {{item.title}} + {{item.time}} + {{item.content}} + + + + + + + + 处理进展 + + 查看详情 + + + {{item.title}} + {{item.time}} + {{item.content}} - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/subpages/home/pages/info/info.wxss b/subpages/home/pages/info/info.wxss index 6ef8f7e..a2d1e7b 100644 --- a/subpages/home/pages/info/info.wxss +++ b/subpages/home/pages/info/info.wxss @@ -1,3 +1,6 @@ +page{ + background: #f7f7f7; +} .info { width: 100%; height: 100vh;