Merge branch 'v2.0.0' of http://113.31.163.91:7777/quanshu/mp-ui-user into v2.0.0

packagePrize/choice/index.vue

@@ -77,7 +77,7 @@
 					<view class="checkbox flex" :class="{ 'checkbox-action': actionIndex == index }" @click="selectPrize(index)">
 						<u-icon name="checkmark" color="#fff" size="14"></u-icon>
 					</view>
-					<view class="info flex">
+					<view class="info flex" @click="selectPrize(index)">
 						<image :src="item.picUrl" mode="aspectFill"></image>
 						<view class="info-content flex">
 							<view class="info-content__title ells-one" v-if="item.prizeType && item.prizeType.value != 'coin'">{{ item.title }}</view>

pages/index/index.vue

@@ -3,6 +3,8 @@
 		<view class="box">
 			<view class="index" :style="{ top: statusHeight + 'px' }">
 				<view class="barrage">
+					<!-- 背景 -->
+					<image class="barrage-bg" src="../../static/index/barrage_bg.png" mode=""></image>
 					<!-- 中奖信息轮播 -->
 					<swiper class="barrage-swiper" :interval="2000" :autoplay="true" :vertical="true" :circular="true">
 						<swiper-item v-for="(item, index) in prizeNewsListOne" :key="index">
@@ -14,6 +16,7 @@
 							</view>
 						</swiper-item>
 					</swiper>
+					<view class="barrage-none"></view>
 				</view>
 				
 				<!-- 查看规则 -->
@@ -516,14 +519,23 @@
 
 	// 中奖信息
 	.barrage {
+		position: relative;
 		width: 518rpx;
-		height: 84rpx;
-		background: linear-gradient(90deg, #FFD220, #FFF7A2);
+		height: 70rpx;
+		
 		border-radius: 42rpx;
 		margin-bottom: 16rpx;
 		margin-left: 34rpx;
 		
+		&-bg {
+			position: absolute;
+			width: 518rpx;
+			height: 70rpx;
+		}
+		
 		&-swiper {
+			position: absolute;
+			z-index: 10;
 			width: 100%;
 			height: 100%;
 			border-radius: 42rpx;
@@ -537,25 +549,32 @@
 					display: flex;
 					align-items: center;
 					width: 510rpx;
-					height: 76rpx;
+					height: 70rpx;
 					
 					image {
-						width: 66rpx;
-						height: 66rpx;
+						width: 70rpx;
+						height: 70rpx;
 						border-radius: 50%;
 						margin-right: 14rpx;
+						margin-left: 12rpx;
 					}
 					
 					.title {
 						flex: 1;
 						font-size: 26rpx;
-						font-family: PingFang SC;
 						font-weight: 500;
-						color: #333333;
+						color: #fff;
 					}
 				}
 			}
 		}
+		
+		&-none {
+			position: absolute;
+			width: 518rpx;
+			height: 70rpx;
+			z-index: 20;
+		}
 	}
 	
 	// 查看规则
@@ -862,9 +881,11 @@
 			align-items: flex-end;
 			
 			.num {
-				line-height: 24rpx;
-				font-size: 24rpx;
+				line-height: 26rpx;
+				font-size: 26rpx;
 				text-decoration: line-through;
+				font-style: italic;
+				color: #FFFEFE;
 			}
 		}
 	}