Browse Source

志愿者打卡,我的消息修改

master
zhaoyongnian 5 years ago
parent
commit
17e81db5b7
  1. 1
      pages/mine/mine.wxss
  2. 2
      subpages/heart/pages/clockIn/clockIn.js
  3. 4
      subpages/heart/pages/clockIn/clockIn.wxml
  4. 37
      subpages/heart/pages/clockIn/clockIn.wxss
  5. 22
      subpages/home/pages/info/info.js
  6. 4
      subpages/home/pages/info/info.wxml
  7. 3
      subpages/home/pages/info/info.wxss

1
pages/mine/mine.wxss

@ -1,6 +1,7 @@
page { page {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background: #f7f7f7;
} }
.mine { .mine {
width: 100%; width: 100%;

2
subpages/heart/pages/clockIn/clockIn.js

@ -251,7 +251,7 @@ Page({
} }
const params={ const params={
actId: this.data.id, actId: this.data.id,
clockDesc: this.data.operationDesc, clockDesc: this.data.operationDesc.substring(0, 500),
clockLongitude: this.data.location.locationLongitude, clockLongitude: this.data.location.locationLongitude,
clockLatitude: this.data.location.locationLatitude, clockLatitude: this.data.location.locationLatitude,
clockAddress: this.data.operationAddress, clockAddress: this.data.operationAddress,

4
subpages/heart/pages/clockIn/clockIn.wxml

@ -2,11 +2,11 @@
<view class="info"> <view class="info">
<textarea bindinput="getbindinput" value="{{operationDesc}}" placeholder="请拍摄活动图片打卡签到500字以内" maxlength="500"></textarea> <textarea bindinput="getbindinput" value="{{operationDesc}}" placeholder="请拍摄活动图片打卡签到500字以内" maxlength="500"></textarea>
<view wx:for="{{phraseList}}" wx:key="{{index}}" class="info-tips" <view class="info-tips">
<view wx:for="{{phraseList}}" wx:key="{{index}}" class="tips"
bindtap="toOperationDesc" bindtap="toOperationDesc"
data-phrase="{{item.phrase}}" data-phrase="{{item.phrase}}"
data-id="{{item.id}}"> data-id="{{item.id}}">
<view class="tips">
<view class="spot"></view> <view class="spot"></view>
<view class="content display-inline">{{item.phrase}}</view> <view class="content display-inline">{{item.phrase}}</view>
</view> </view>

37
subpages/heart/pages/clockIn/clockIn.wxss

@ -1,39 +1,51 @@
.container { .container {
width: 100%; width: 100%;
} }
.info { .info {
background-color: #fff; background-color: #fff;
border-radius: 20rpx; border-radius: 20rpx;
margin: 20rpx 20rpx 0rpx 20rpx; margin: 20rpx 20rpx 0rpx 20rpx;
padding-bottom: 10rpx; padding-bottom: 10rpx;
} }
textarea { textarea {
padding-top: 39rpx; padding-top: 39rpx;
width: calc(100% - 50rpx); width: calc(100% - 50rpx);
margin-left: 25rpx; margin-left: 25rpx;
/* padding: 39rpx 25rpx 39rpx 25rpx; */ /* padding: 39rpx 25rpx 39rpx 25rpx; */
} }
.info-tips { .info-tips {
width: 100%; width: 100%;
height: auto; height: auto;
display: flex;
flex-direction: column;
align-items: flex-start;
} }
.tips { .tips {
background-color: #D9D9D9; background-color: #d9d9d9;
border-radius: 20rpx; border-radius: 20rpx;
margin: 20rpx 20rpx 0rpx 20rpx; margin: 20rpx 20rpx 0rpx 20rpx;
display: inline-block; display: inline-block;
padding: 8rpx 10rpx; padding: 8rpx 10rpx;
} }
.spot { .spot {
width: 14rpx; width: 14rpx;
height: 14rpx; height: 14rpx;
background-color: #C1C1C1; background-color: #c1c1c1;
border-radius: 50%; border-radius: 50%;
position: relative; position: relative;
float: left; float: left;
top: 10rpx; top: 10rpx;
} }
.display-inline{display:inline}
.display-inline {
display: inline;
}
.content { .content {
float: left; float: left;
font-size: 28rpx; font-size: 28rpx;
@ -41,25 +53,30 @@ textarea{
margin-left: 10rpx; margin-left: 10rpx;
color: rgba(102, 102, 102, 1); color: rgba(102, 102, 102, 1);
} }
.info-line { .info-line {
height: 3rpx; height: 3rpx;
background-color: #EAEAEA; background-color: #eaeaea;
width: 100whh; width: 100whh;
margin: 30rpx 24rpx 20rpx; margin: 30rpx 24rpx 20rpx;
} }
.photo { .photo {
padding: 18rpx; padding: 18rpx;
} }
.wux-upload--picture-card .wux-upload__select { .wux-upload--picture-card .wux-upload__select {
width: 220rpx !important; width: 220rpx !important;
height: 220rpx !important; height: 220rpx !important;
} }
.wux-upload--picture-card .wux-upload__file { .wux-upload--picture-card .wux-upload__file {
width: 220rpx !important; width: 220rpx !important;
height: 220rpx !important; height: 220rpx !important;
border: 2rpx solid #EAEAEA !important; border: 2rpx solid #eaeaea !important;
margin: 0 40rpx 40rpx 0 !important; margin: 0 40rpx 40rpx 0 !important;
} }
.wux-upload--picture-card .wux-upload__remove { .wux-upload--picture-card .wux-upload__remove {
width: 46rpx !important; width: 46rpx !important;
height: 46rpx !important; height: 46rpx !important;
@ -69,6 +86,7 @@ textarea{
} }
/* 定位 */ /* 定位 */
.location { .location {
margin: 20rpx 20rpx 0rpx 20rpx; margin: 20rpx 20rpx 0rpx 20rpx;
padding-bottom: 35rpx; padding-bottom: 35rpx;
@ -88,9 +106,7 @@ textarea{
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
} }
.info-box-last-require {
.info-box-last-require
{
width: 100wh; width: 100wh;
height: auto; height: auto;
padding: 30rpx 0rpx 0 0; padding: 30rpx 0rpx 0 0;
@ -100,16 +116,19 @@ textarea{
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
line-height: 54rpx; line-height: 54rpx;
} }
.refresh { .refresh {
margin: 30rpx 20rpx; margin: 30rpx 20rpx;
} }
.refresh image { .refresh image {
width: 30.3rpx; width: 30.3rpx;
height: 30.3rpx; height: 30.3rpx;
float: left; float: left;
position: relative; position: relative;
top: 5rpx top: 5rpx;
} }
.refresh-name { .refresh-name {
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;

22
subpages/home/pages/info/info.js

@ -8,6 +8,7 @@ Page({
infoList: [] infoList: []
}, },
onShow() { onShow() {
// 重置数据
this.setData({ this.setData({
pageNo: 1, pageNo: 1,
infoList: [] infoList: []
@ -72,6 +73,19 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: `/subpages/discussion/pages/discussionDetail/discussionDetail?detailId=${issueId}&type=project` 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') { } else if (type === '1') {
if (businessType === 'groupTopicClosed') { if (businessType === 'groupTopicClosed') {
@ -90,6 +104,14 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: `/subpages/association/pages/topicDetail/topicDetail?detailId=${issueId}` 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') { } else if (type === '2') {
if (businessType === 'topicToIssuePass') { if (businessType === 'topicToIssuePass') {

4
subpages/home/pages/info/info.wxml

@ -23,13 +23,13 @@
<span>互动通知</span> <span>互动通知</span>
<view wx:if="{{item.readFlag == '0'}}" class="point"></view> <view wx:if="{{item.readFlag == '0'}}" class="point"></view>
</view> </view>
<view class="right">查看详情</view> <view wx:if='{{item.businessType != "points" && item.businessType != "points_act_plus" &&item.businessType != "points_act_sign_out" && item.businessType != "points_act_reject"}}' class="right">查看详情</view>
</view> </view>
<view class="info-bottom"> <view class="info-bottom">
<view class="title">{{item.title}}</view> <view class="title">{{item.title}}</view>
<view class="time">{{item.time}}</view> <view class="time">{{item.time}}</view>
<view class="content">{{item.content}}</view> <view class="content">{{item.content}}</view>
<view class="remark">{{item.relBusinessContent}}</view> <view wx:if='{{item.businessType != "points"}}' class="remark">{{item.relBusinessContent}}</view>
</view> </view>
</view> </view>
<view class="info-item" wx:if="{{item.type=='3'}}" data-item="{{item}}" bindtap="lookDetail"> <view class="info-item" wx:if="{{item.type=='3'}}" data-item="{{item}}" bindtap="lookDetail">

3
subpages/home/pages/info/info.wxss

@ -1,3 +1,6 @@
page{
background: #f7f7f7;
}
.info { .info {
width: 100%; width: 100%;
height: 100vh; height: 100vh;

Loading…
Cancel
Save