修改为进行中/已结束都可填写公益档案

components/pages/nonprofitItem/index.vue

@@ -30,11 +30,11 @@
 					</view>
 					<view class="tip-right">{{item?.provinceName||''}}{{item?.cityName||''}}</view>
 				</view>
-				<view class="bottom">
+				<view class="bottom adfac">
 					<view class="btn" @click.stop="handleCancel" v-if="(item.activeState==1||item.activeState===0)&&item.signupState==1">取消报名</view>
 					<view class="btn" @click.stop="toDetail(item)" v-if="item.activeState==1&&item.signupState==-1">立即报名</view>
 					<view class="btn" @click.stop="handleSignup" v-if="item.activeState==2&&item.signupState==1">去签到</view>
-					<view class="btn" @click.stop="handleFill" v-if="item.activeState==3&&item.signupState==2">写档案</view>
+					<view class="btn" @click.stop="handleFill" v-if="(item.activeState==2||item.activeState==3)&&(item.signupState==1||item.signupState==2)">写档案</view>
 					<view class="btn" @click.stop="handleReview" v-if="item.activeState==3&&item.signupState==3">查看档案</view>
 				</view>
 			</view>
@@ -246,7 +246,6 @@
 				}
 				.bottom{
 					margin-top: 30rpx;
-					display: flex;
 					justify-content: flex-end;
 				}
 				.btn{
@@ -258,6 +257,7 @@
 					font-size: 24rpx;
 					color: #252525;
 					line-height: 30rpx;
+					margin-left: 20rpx;
 				}
 			}
 		}

pagesNonprofit/nonprofitDetail.vue

@@ -84,12 +84,12 @@
 		</view>
 		<view class="bottom adfacjb">
 			<view class="right" @click="handleCancel" v-if="info?.activeState==1&&info?.signupState==1">取消报名</view>
-			<view class="right" @click="handleApply" v-else-if="info?.activeState==1&&info?.signupState==-1">立即报名</view>
-			<view class="right" @click="handleSignup" v-else-if="info?.activeState==2&&info?.signupState==1">去签到</view>
-			<view class="right grey" v-else-if="info?.activeState==2&&info?.signupState==2">已签到</view>
-			<view class="right" @click="handleFill" v-else-if="info?.activeState==3&&info?.signupState==2">写档案</view>
-			<view class="right" @click="handleReview" v-else-if="info?.activeState==3&&info?.signupState==3">查看档案</view>
-			<view class="right grey" v-else-if="info?.activeState==-1">活动已取消</view>
+			<view class="right" @click="handleApply" v-if="info?.activeState==1&&info?.signupState==-1">立即报名</view>
+			<view class="right" :class="{'half':[2,3].includes(info?.activeState)&&[1,2].includes(info?.signupState)}" @click="handleSignup" v-if="info?.activeState==2&&info?.signupState==1">去签到</view>
+			<view class="right grey" :class="{'half':[2,3].includes(info?.activeState)&&[1,2].includes(info?.signupState)}" v-if="info?.activeState==2&&info?.signupState==2">已签到</view>
+			<view class="right" :class="{'half':[2].includes(info?.activeState)&&[1,2].includes(info?.signupState)}" @click="handleFill" v-if="[2,3].includes(info?.activeState)&&[1,2].includes(info?.signupState)">写档案</view>
+			<view class="right" @click="handleReview" v-if="info?.activeState==3&&info?.signupState==3">查看档案</view>
+			<view class="right grey" v-if="info?.activeState==-1">活动已取消</view>
 		</view>
 	</view>
 </template>
@@ -518,6 +518,9 @@
 				&.grey{
 					background: #F7F7F7;
 				}
+				&.half{
+					width: calc(50% - 20rpx);
+				}
 			}
 		}