2023-10-21

pages/index/entertainment.vue

@@ -113,16 +113,13 @@
 				<view class="biwe">{{item.num*1}}</view>
 				<view class="biwe">{{item.get-item.num}}</view>
 				<view class="biwe flex-center">
-					<view v-if="item.status==1" class="list-buttom success margin-r-10">
-						{{$t('enter.u17')}}
+					<view v-if="item.status==0" class="list-buttom primary margin-r-10">
+						進行中
 					</view>
-					<view v-else class="list-buttom red margin-r-10">
-						未开奖
-					</view>
-					<view class="list-buttom primary"  v-if="item.result==1">
+					<view class="list-buttom red"  v-if="item.result===1">
 						中獎
 					</view>
-					<view class="list-buttom primary" >
+					<view class="list-buttom success" v-if="item.result===0">
 						未中獎
 					</view>
 				</view>
@@ -765,7 +762,7 @@
 
 		.tab-item {
 			color: #FFF;
-			font-size: $font-sm;
+			font-size: $font-lg;
 			padding: 0 20rpx;
 			padding-bottom: 10rpx;
 

pages/user/shareQrCode.vue

@@ -6,9 +6,12 @@
 				<view class="lis" v-if="item.result === 1">
 					<view class="liss green">中獎</view>
 				</view>
-				<view class="lis" v-else>
+				<view class="lis" v-if="item.result === 0">
 					<view class="liss red">未中獎</view>
 				</view>
+				<view class="lis" v-if="item.status === 0">
+					<view class="liss primary">進行中</view>
+				</view>
 			</view>
 			<view class="listT">
 				<view class="TT flex">
@@ -140,6 +143,9 @@
 				&.green{
 					background: $color-green;
 				}
+				&.primary {
+					background: #01ebf6;
+				}
 			}
 		}