免费抽奖活动列表与活动详情页调整

packageOperate/activity/index.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
 		<u-navbar title="免费抽奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
-		<u-count-down :time="30 * 60 * 60 * 1000" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
+		<u-count-down :time="activityTime" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
 			<view style="height: 98rpx;background-color: #fff;margin: 0 30rpx;line-height: 98rpx;overflow: hidden;">
 				<view class="data-btn">距离开奖时间：
-					<text>{{timeData.days}}&nbsp;天</text>
+					<text v-if="timeData.days != 0" >{{timeData.days}}&nbsp;天</text>
 					<text>{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}&nbsp;:</text>
 					<text>{{timeData.minutes}}&nbsp;:</text>
 					<text>{{timeData.seconds}}</text>
@@ -114,6 +114,7 @@
 				timeData: {}, //时间
 				awardsList: [], //奖品
 				inviteCode: '', //邀请码
+				activityTime: 0
 			}
 		},
 		onLoad(opthios) {
@@ -141,15 +142,14 @@
 							})
 						})
 						this.awardsList = awardsList
-						// let picUrlArr = res.data.picUrl.split(',')
-						// picUrlArr.forEach(item => {
-						// 	this.picUrlArr.push(env.filePublic + item + '?imageView2/2/w/750')
-						// })
 						// 处理富文本
 						const description = res.data.description.replaceAll(".jpg\"", ".jpg?imageView2/2/w/750\"")
 							.replaceAll(".jpeg\"", ".jpeg?imageView2/2/w/750\"").replaceAll(".png\"",
 								".png?imageView2/2/w/750\"");
 						this.description = this.formatRichText(description);
+						let timestamp = parseInt(new Date().getTime())
+						this.activityTime = this.info.endTime - timestamp
+						console.log(this.activityTime);
 					}
 				}).catch(() => {
 					uni.hideLoading();

packageOperate/activity/record.vue

@@ -88,7 +88,7 @@
 	.list {
 
 		&-view {
-			padding: 10rpx 30rpx;
+			padding: 10rpx 20rpx;
 
 			.award {
 				border-radius: 22rpx;

pages/activity/index.vue

@@ -20,14 +20,14 @@
 		<view class="list">
 			<view v-for="(item,index) in list" :key="index" class="list-view">
 				<view class="list-view-slot">
-					<navigator :url="item.status.value == 4 ?`/packageOperate/activity/record?id=${ item.id }`:`/packageOperate/activity/index?id=${ item.id }`">
+					<navigator hover-class="none" :url="item.status.value == 4 ?`/packageOperate/activity/record?id=${ item.id }`:`/packageOperate/activity/index?id=${ item.id }`">
 						<view>
 							<image :src="item.picUrl" mode="" class="list-view-slot-img"></image>
 						</view>
 						<view class="list-view-slot-bor">
 							<view  class="list-view-slot-bor-title">
 								<view class="time bor-title">{{item.title}}</view>
-								<view class="time" >开奖时间：{{ $parseTime(item.startTime, '{y}-{m}-{d} {h}:{i}:{s}')}}</view>
+								<view class="time" >开奖时间：{{ $parseTime(item.endTime, '{y}-{m}-{d} {h}:{i}:{s}')}}</view>
 							</view>
 							<view class="details">
 								<button class="details-button" v-if="item.status.value == 3" >查看详情</button>