소스 검색

增加已取消样式

htc 5 일 전
부모
커밋
dd9153adf5
2개의 변경된 파일12개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 1
      pages/nonprofit.vue
  2. 10 1
      pagesNonprofit/nonprofitDetail.vue

+ 2 - 1
pages/nonprofit.vue

@@ -7,6 +7,7 @@
 			<view class="tab-pre" :class="{'active':tidx===1}" @click="changeTab(1)">未开始</view>
 			<view class="tab-pre" :class="{'active':tidx===2}" @click="changeTab(2)">进行中</view>
 			<view class="tab-pre" :class="{'active':tidx===3}" @click="changeTab(3)">已结束</view>
+			<view class="tab-pre" :class="{'active':tidx===-1}" @click="changeTab(-1)">已取消</view>
 		</view>
 		<view class="list" v-if="list.length">
 			<up-list @scrolltolower="scrolltolower" style="height: 100%;">
@@ -136,7 +137,7 @@
 			box-sizing: border-box;
 			background: #FFFFFF;
 			&-pre{
-				width: calc(100% / 3);
+				width: calc(100% / 4);
 				position: relative;
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;

+ 10 - 1
pagesNonprofit/nonprofitDetail.vue

@@ -4,7 +4,7 @@
 		<image src="https://oss.familydaf.cn/sxsnfile/20251218/ff31a76e0e1148378a318382b998a51f.png" class="top_bg_img" mode="widthFix"></image>
 		<view class="top">
 			<view class="top-status adfacjb">
-				<view class="left">{{signupStateDict[info?.signupState]||'未知'}}</view>
+				<view class="left adfac">{{signupStateDict[info?.signupState]||'未知'}} <span v-if="info?.signupState==-1">报名人数不足,活动已取消</span></view>
 				<view class="right" v-if="info?.activityLimit==1"><span>{{info?.valueLimit||0}}</span>爱心值</view>
 				<view class="right" v-else-if="info?.activityLimit==2"><span>{{info?.valueLimit||0}}</span>张专享券</view>
 				<view class="right" v-else-if="info?.activityLimit==3"><span>免费</span></view>
@@ -89,6 +89,7 @@
 			<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" @click="handleReview" v-else-if="info?.activeState==-1">活动已取消</view>
 		</view>
 	</view>
 </template>
@@ -274,6 +275,14 @@
 					font-size: 40rpx;
 					color: #252525;
 					line-height: 48rpx;
+					label{
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #676775;
+						line-height: 24rpx;
+						margin-left: 16rpx;
+					}
 				}
 				.right{
 					font-family: PingFangSC, PingFang SC;