소스 검색

免费抽奖正在进行活动列表修改

DELL 3 년 전
부모
커밋
0a7ff2ffd2
2개의 변경된 파일27개의 추가작업 그리고 17개의 파일을 삭제
  1. 0 3
      packageOperate/activity/record.vue
  2. 27 14
      pages/activity/index.vue

+ 0 - 3
packageOperate/activity/record.vue

@@ -61,11 +61,8 @@
 					<button @click="toPrize()" v-if="listData.prizeType && listData.prizeType !='COIN'" class="btnone"
 						style="">前往查看</button>
 					<button @click="toCore()" v-else class="btnone">去兑换商品</button>
-
 					<button @click="close()" class="btntwo" style="">关闭</button>
-
 				</view>
-
 			</view>
 		</u-popup>
 

+ 27 - 14
pages/activity/index.vue

@@ -21,22 +21,24 @@
 			<view v-for="(item,index) in list" :key="index" class="list-view">
 				<view class="list-view-slot">
 					<view @click="toRecord(item)">
-						<view>
+						<view style="position: relative;">
 							<image :src="item.picUrl" mode="" class="list-view-slot-img"></image>
+							<span v-if="item.status.value == 3" style="position: absolute; right: 30rpx; top: 300rpx; border-radius: 6rpx; font-size: 24rpx; padding: 10rpx; color: #333333; background-color: rgba(255, 255, 255, 0.5);">{{item.fakeNum}}人已参加</span>
 						</view>
 						<view class="list-view-slot-bor">
 							<view class="list-view-slot-bor-title">
 								<view class="time bor-title">{{item.title}}</view>
-								<view v-if="item.status.value == 2" class="time">
-									开始时间:{{ $parseTime(item.startTime, '{y}-{m}-{d} {h}:{i}:{s}')}}</view>
-								<view v-else class="time">开奖时间:{{ $parseTime(item.endTime, '{y}-{m}-{d} {h}:{i}:{s}')}}
-								</view>
+								<!-- <view v-if="item.status.value == 2" class="time">
+									开始时间:{{ $parseTime(item.startTime, '{y}-{m}-{d} {h}:{i}:{s}')}}</view> -->
+								<!-- <view v-else class="time">开奖时间:{{ $parseTime(item.endTime, '{y}-{m}-{d} {h}:{i}:{s}')}} -->
+								<view v-if="item.status.value == 3" class="timetwo">开奖时间:{{ $parseTime(item.endTime, '{y}-{m}-{d} {h}:{i}:{s}')}}</view>
+								<view v-else 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>
+								<button class="details-button" v-if="item.status.value == 3">免费参与</button>
 								<button class="details-buttonTwo" v-else-if="item.isHit == 0">未中奖</button>
 								<button class="details-button" v-else-if="item.isHit == 1">已中奖</button>
-								<button class="details-buttonTwo" v-else>即将开始</button>
+								<!-- <button class="details-buttonTwo" v-else>即将开始</button> -->
 							</view>
 						</view>
 					</view>
@@ -46,7 +48,8 @@
 
 			<view class="flex empty" v-if="!list.length && !loading">
 				<view class="center">
-					<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode=""></image>
+					<image class="center-img"
+						src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode=""></image>
 					<view class="center-font">新的活动正在准备中...</view>
 				</view>
 				<!-- <u-empty text="活动为空" mode="order" /> -->
@@ -162,7 +165,7 @@
 
 		&-view {
 			text-align: center;
-			height: 530rpx;
+			height: 560rpx;
 
 			&-slot {
 				background-color: #FFFFFF;
@@ -179,7 +182,7 @@
 				&-bor {
 					line-height: 50rpx;
 					width: 700rpx;
-					height: 120rpx;
+					height: 140rpx;
 					margin: 0 auto;
 					padding: 10rpx 20rpx 0 20rpx;
 					border-radius: 0 0 22rpx 22rpx;
@@ -195,6 +198,16 @@
 						.bor-title {
 							font-size: 34rpx;
 						}
+
+						.timetwo {
+							margin-top: 10rpx;
+							border: 2rpx solid #F9822C;
+							font-size: 26rpx;
+							border-radius: 6rpx;
+							color: #F9822C;
+							padding: 0 15rpx;
+							line-height: 40rpx;
+						}
 					}
 
 					.details {
@@ -206,9 +219,9 @@
 							line-height: 72rpx;
 							background-color: #F9822C;
 							color: #fff;
-							margin-top: 18rpx;
+							margin-top: 30rpx;
 							font-size: 30rpx;
-							border-radius: 36rpx;
+							border-radius: 20rpx;
 						}
 
 						.details-buttonTwo {
@@ -217,9 +230,9 @@
 							line-height: 72rpx;
 							background-color: #BBBBBB;
 							color: #fff;
-							margin-top: 18rpx;
+							margin-top: 30rpx;
 							font-size: 30rpx;
-							border-radius: 36rpx;
+							border-radius: 20rpx;
 						}
 					}