时间为空处理、类型样式布局修改

components/pages/nonprofitActivety/index.vue

@@ -13,7 +13,7 @@
 						<text>截止报名：</text>
 					</view>
 					<!-- <view class="tip-right">{{item.endTimeText}}</view> -->
-					<view class="tip-right">{{item.signupEndTime||'暂无'}}</view>
+					<view class="tip-right">{{item.signupEndTime||''}}</view>
 				</view>
 				<view class="tip adf">
 					<view class="tip-left adfac">

pages/home.vue

@@ -101,12 +101,12 @@
 	const changeType = (item,index) => {
 		queryParams.value.categoryId = item.id;
 		tlIndex.value = index;
-		if(typeList.value.length>4){
-			if(index<3) scrollLeft.value = 0
-			else{
-				scrollLeft.value = (index-2)*172/2;
-			}
-		}
+		// if(typeList.value.length>4){
+		// 	if(index<3) scrollLeft.value = 0
+		// 	else{
+		// 		scrollLeft.value = (index-2)*172/2;
+		// 	}
+		// }
 		initList();
 		getActivityList();
 	}
@@ -151,7 +151,7 @@
 			activityList.value.forEach(a=>{
 				let cc = calculateCountdown(a?.signupEndTime);
 				a.endTimeText = cc===-1?a?.signupEndTime:(`还有${cc.days}天${cc.hours}小时${cc.minutes}分钟`)
-				a.signupEndTime = new Date(a.signupEndTime).Format('yyyy.MM.dd hh:mm')
+				a.signupEndTime = a.signupEndTime?new Date(a.signupEndTime).Format('yyyy.MM.dd hh:mm'):''
 			})
 			queryParams.value.page++;
 			if(res.data.list.length===0) isOver.value = true;
@@ -225,7 +225,7 @@
 	
 	.scroll-view-item_H {
 		display: inline-block;
-		width: 152rpx;
+		// width: 152rpx;
 		height: 100%;
 		margin-left: 20rpx;
 		&:first-child{
@@ -273,7 +273,8 @@
 				height: 68rpx;
 				margin-top: 31rpx;
 				.cl_item{
-					width: 152rpx;
+					// width: 152rpx;
+					padding: 0 21rpx;
 					height: 68rpx;
 					background: #FFFFFF;
 					border-radius: 34rpx;

pages/nonprofit.vue

@@ -71,8 +71,8 @@
 			if(res.code!==0) return proxy.$showToast(res.msg)
 			list.value = [...list.value,...res.data.list];
 			list.value.forEach(l=>{
-				l.activityStartTime = new Date(l.activityStartTime).Format('yyyy.MM.dd')
-				l.activityEndTime = new Date(l.activityEndTime).Format('yyyy.MM.dd')
+				l.activityStartTime = l.activityStartTime?new Date(l.activityStartTime).Format('yyyy.MM.dd'):''
+				l.activityEndTime = l.activityEndTime?new Date(l.activityEndTime).Format('yyyy.MM.dd'):''
 				l.age = getAge(l.idCard)
 			})
 			queryParams.value.page++;

pagesHome/allActivity.vue

@@ -66,7 +66,9 @@
 		<view class="window nbg" :style="{'top':topAll+'px','height':'calc(100vh - '+topAll+'px)'}" v-if="allShow">
 			<view class="window-bg" @click="handleAll"></view>
 			<view class="window-all">
-				<view class="pre" v-for="(t,i) in typeList2" :key="i" @click="changeType2(t,t.name,i)">{{t.name}}</view>
+				<view class="wabox">
+					<view class="pre" v-for="(t,i) in typeList2" :key="i" @click="changeType2(t,t.name,i)">{{t.name}}</view>
+				</view>
 			</view>
 		</view>
 		<login-register></login-register>
@@ -171,16 +173,16 @@
 		
 		if(name==='全部'){
 			typeIndex.value = '';
-			scrollLeft.value = 0;
+			// scrollLeft.value = 0;
 		}else{
 			index--;
 			typeIndex.value = index;
-			if(typeList.value.length>4){
-				if(index<3) scrollLeft.value = 0
-				else{
-					scrollLeft.value = (index-2)*154/2;
-				}
-			}
+			// if(typeList.value.length>4){
+			// 	if(index<3) scrollLeft.value = 0
+			// 	else{
+			// 		scrollLeft.value = (index-2)*154/2;
+			// 	}
+			// }
 		}
 		allShow.value = false;
 		getActivityList()
@@ -257,7 +259,7 @@
 			if(res.code!==0) return proxy.$showToast(res.msg)
 			list.value = [...list.value,...res.data.list];
 			list.value.forEach(a=>{
-				a.signupEndTime = new Date(a.signupEndTime).Format('yyyy.MM.dd hh:mm')
+				a.signupEndTime = a.signupEndTime?new Date(a.signupEndTime).Format('yyyy.MM.dd hh:mm'):''
 			})
 			queryParams.value.page++;
 			if(res.data.list.length===0) isOver.value = true
@@ -311,7 +313,7 @@
 				padding-right: 40rpx;
 				box-sizing: border-box;
 				.cl_item{
-					width: 112rpx;
+					// width: 112rpx;
 					line-height: 50rpx;
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
@@ -449,12 +451,13 @@
 		&-all{
 			padding: 26rpx 30rpx 103rpx;
 			background: #FFFFFF;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
 			border-radius: 0 0 24rpx 24rpx;
+			.wabox{
+				margin-left: -18rpx;
+				overflow: hidden;
+			}
 			.pre{
-				width: calc(100% / 3 - 12rpx);
+				width: calc(100% / 3 - 18rpx);
 				height: 59rpx;
 				background: #F7F7F7;
 				border-radius: 30rpx;
@@ -465,6 +468,8 @@
 				line-height: 59rpx;
 				text-align: center;
 				margin-top: 24rpx;
+				margin-left: 18rpx;
+				float: left;
 			}
 		}
 		

pagesMy/achievement.vue

@@ -375,7 +375,7 @@
 		proxy.$api.get('/core/love/value/record/obtainedMedalList',queryParams.value).then(({data:res})=>{
 			if(res.code!==0) return proxy.$showToast(res.msg)
 			list.value = queryParams.value.obtained?res.data.list:res.data.list.filter(d=>!d.lightUpDate)
-			list.value.forEach(l=>l.lightUpDate2 = new Date(l.lightUpDate).Format('yyyy.MM.dd'));
+			list.value.forEach(l=>l.lightUpDate2 = l.lightUpDate?new Date(l.lightUpDate).Format('yyyy.MM.dd'):'');
 		})
 	}
 	

pagesMy/archives.vue

@@ -70,8 +70,8 @@
 			list.value = [...list.value,...res.data.list];
 			list.value.forEach(l=>{
 				l.age = getAge(l.idCard)
-				l.activityStartTime = new Date(l.activityStartTime).Format('yyyy.MM.dd')
-				l.activityEndTime = new Date(l.activityEndTime).Format('yyyy.MM.dd')
+				l.activityStartTime = l.activityStartTime?new Date(l.activityStartTime).Format('yyyy.MM.dd'):''
+				l.activityEndTime = l.activityEndTime?new Date(l.activityEndTime).Format('yyyy.MM.dd'):''
 			})
 			queryParams.value.page++;
 			if(res.data.list.length===0) isOver.value = true;

pagesMy/practice.vue

@@ -110,8 +110,8 @@
 			if(res.code!==0) return proxy.$showToast(res.msg)
 			list.value = [...list.value,...res.data.list]
 			list.value.forEach(l=>{
-				l.activityStartTime = new Date(l.activityStartTime).Format('yyyy.MM.dd');
-				l.activityEndTime = new Date(l.activityEndTime).Format('yyyy.MM.dd');
+				l.activityStartTime = l.activityStartTime?new Date(l.activityStartTime).Format('yyyy.MM.dd'):'';
+				l.activityEndTime = l.activityEndTime?new Date(l.activityEndTime).Format('yyyy.MM.dd'):'';
 				l.check = false;
 				l.age = getAge(l.idCard);
 			})