Merge branch 'master' into dev_1.1.7_lint

pages/index.vue

@@ -844,12 +844,15 @@ body,
 		display: flex;
 		align-items: center;
 		justify-content: center;
+
 		.gift {
 			margin-right: 1.4rem;
+
 			img {
 				width: 5.2rem;
 			}
 		}
+
 		.txt {
 			font-size: 1.8rem;
 			text-align: left;
@@ -953,6 +956,7 @@ body,
 					color: #444444;
 				}
 			}
+
 			.luck-custom-prize {
 				font-weight: 500;
 				font-size: 14px;
@@ -970,7 +974,7 @@ body,
 		background: #fff;
 		width: 100%;
 		flex-wrap: wrap;
-		height: 20rem;
+		height: 18rem;
 		box-shadow: 0px -4px 10px rgba(0, 0, 0, 0.1);
 		border-top-left-radius: 1rem;
 		border-top-right-radius: 1rem;
@@ -978,20 +982,24 @@ body,
 		.area-list {
 			width: 34.3rem;
 			margin: 1.5rem auto;
+
 			.item {
 				clear: both;
 				overflow: hidden;
 				margin: 0.7rem 0;
 				font-size: 1.6rem;
 				font-weight: 500;
+
 				.icon {
 					float: left;
 					margin-right: 0.8rem;
 				}
+
 				.font {
 					float: left;
 					margin-right: 0.8rem;
 				}
+
 				.pc {
 					float: left;
 				}
@@ -1046,6 +1054,7 @@ body,
 		font-size: 15px;
 		color: #000;
 		height: 54px;
+
 		img {
 			width: 30px;
 			height: 30px;
@@ -1096,10 +1105,12 @@ body,
 		overflow-y: hidden;
 		box-shadow: 0 0.3rem 2rem rgba(0, 0, 0, 0.2);
 		background: #fff;
+
 		.customImg {
 			width: 100%;
 			min-height: 373px;
 		}
+
 		.customBottom {
 			width: 100%;
 			background: #111214;
@@ -1110,28 +1121,34 @@ body,
 			letter-spacing: 0.3px;
 			color: #838383;
 			line-height: 20px;
+
 			.theme {
 				display: flex;
 				height: 20px;
 				align-items: center;
 				justify-content: flex-start;
+
 				.icon {
 					width: 12px;
 				}
+
 				.time {
 					margin: 0 4px;
 					color: #1d9bf0;
 				}
 			}
+
 			.winner-info {
 				display: flex;
 				height: 20px;
 				align-items: center;
 				justify-content: flex-start;
+
 				.count {
 					color: #1d9bf0;
 					margin-right: 4px;
 				}
+
 				.prize-name {
 					color: #1d9bf0;
 					margin-left: 4px;
@@ -1153,6 +1170,7 @@ body,
 		overflow-y: hidden;
 		box-shadow: 0 0 5px #888888;
 		background: #fff;
+
 		&.auto-height {
 			height: auto;
 		}
@@ -1479,6 +1497,7 @@ body,
 						color: #444444;
 					}
 				}
+
 				.luck-custom-prize {
 					font-weight: 500;
 					font-size: 14px;
@@ -1561,6 +1580,7 @@ body,
 			height: 3.3rem;
 			line-height: 3.3rem;
 			font-weight: normal;
+
 			span {
 				font-size: 1.4rem;
 			}

pages/luckdraw.vue

@@ -708,6 +708,7 @@ body,
 	width: 100%;
 	height: 100%;
 	background: #fff;
+
 	.loading {
 		position: absolute;
 		transform: translate(-50%, -50%);
@@ -717,26 +718,31 @@ body,
 		width: 40px;
 		border-radius: 50%;
 	}
+
 	.logo {
 		display: flex;
 		align-items: center;
 		height: 70px;
 		margin-left: 25px;
+
 		img {
 			width: 99px;
 			height: 32px;
 		}
 	}
+
 	.show {
 		display: flex;
 		align-items: center;
 		height: calc(100% - 70px);
+
 		.center {
 			display: flex;
 			margin: -50px auto 0;
 			justify-content: space-between;
 			width: 1000px;
 			position: relative;
+
 			.head-in-custom {
 				position: absolute;
 				bottom: 100%;
@@ -748,6 +754,7 @@ body,
 				font-size: 15px;
 				color: #000;
 				height: 54px;
+
 				img {
 					width: 30px;
 					height: 30px;
@@ -755,6 +762,7 @@ body,
 					margin-right: 10px;
 				}
 			}
+
 			.giveaway {
 				position: relative;
 				overflow: hidden;
@@ -767,10 +775,12 @@ body,
 				&.bg {
 					background: linear-gradient(17.98deg, #3438ff 3.69%, #8b56fc 74.32%);
 				}
+
 				&.custom {
 					background: unset;
 					height: auto !important;
 				}
+
 				&.auto-height {
 					height: auto;
 				}
@@ -782,10 +792,12 @@ body,
 					width: 110px;
 					height: 94px;
 				}
+
 				.head {
 					display: flex;
 					height: 50px;
 					align-items: center;
+
 					img {
 						width: 20px;
 						height: 20px;
@@ -793,6 +805,7 @@ body,
 						margin: 0 10px 0 15px;
 						border: solid 2px #fff;
 					}
+
 					span {
 						color: #fff;
 						font-size: 13px;
@@ -801,8 +814,10 @@ body,
 						letter-spacing: 0.005em;
 					}
 				}
+
 				.price {
 					text-align: center;
+
 					.usdt {
 						margin: 10px 0;
 						color: #ffffff;
@@ -812,10 +827,12 @@ body,
 						text-align: center;
 						letter-spacing: 0.3px;
 					}
+
 					.money {
 						display: flex;
 						align-items: center;
 						justify-content: center;
+
 						img {
 							width: 46px;
 							height: 46px;
@@ -823,6 +840,7 @@ body,
 							border-radius: 50%;
 							border: solid 3px #fff;
 						}
+
 						span {
 							color: #fff;
 							font-size: 60px;
@@ -831,6 +849,7 @@ body,
 						}
 					}
 				}
+
 				.time {
 					display: flex;
 					height: 46px;
@@ -842,24 +861,29 @@ body,
 					line-height: 33px;
 					text-align: center;
 					background: rgba($color: #000000, $alpha: 0.15);
+
 					.img {
 						width: 26px;
 						margin-right: 10px;
 					}
 				}
+
 				.box {
 					margin: auto;
 					width: 200px;
 					height: 200px;
 					margin-top: 27px;
+
 					img {
 						width: 100%;
 						height: 100%;
 					}
 				}
 			}
+
 			.desc {
 				width: 520px;
+
 				.title {
 					color: #2c2c2c;
 					font-size: 36px;
@@ -868,10 +892,12 @@ body,
 					margin-top: 90px;
 					margin-bottom: 20px;
 				}
+
 				.issue {
 					font-size: 15px;
 					color: #a4a4a4;
 				}
+
 				.button {
 					cursor: pointer;
 					height: 64px;
@@ -887,12 +913,15 @@ body,
 	height: 100%;
 	position: relative;
 	background-color: #fff;
+
 	&.bg {
 		background: linear-gradient(17.98deg, #3438ff 3.69%, #8b56fc 74.32%);
 	}
+
 	&.custom {
 		background: #111214 !important;
 	}
+
 	.lottery {
 		position: absolute;
 		top: 0;
@@ -900,13 +929,16 @@ body,
 		width: 110px;
 		height: 94px;
 	}
+
 	.luck-list {
 		height: calc(100% - 430px);
 	}
+
 	.head {
 		display: flex;
 		height: 50px;
 		align-items: center;
+
 		img {
 			width: 20px;
 			height: 20px;
@@ -914,6 +946,7 @@ body,
 			margin: 0 10px 0 15px;
 			border: solid 2px #fff;
 		}
+
 		span {
 			color: #fff;
 			font-size: 13px;
@@ -922,8 +955,10 @@ body,
 			letter-spacing: 0.005em;
 		}
 	}
+
 	.price {
 		text-align: center;
+
 		.usdt {
 			margin: 10px 0;
 			color: #ffffff;
@@ -933,10 +968,12 @@ body,
 			text-align: center;
 			letter-spacing: 0.3px;
 		}
+
 		.money {
 			display: flex;
 			align-items: center;
 			justify-content: center;
+
 			img {
 				width: 46px;
 				height: 46px;
@@ -944,6 +981,7 @@ body,
 				border-radius: 50%;
 				border: solid 3px #fff;
 			}
+
 			span {
 				color: #fff;
 				font-size: 60px;
@@ -952,6 +990,7 @@ body,
 			}
 		}
 	}
+
 	.time {
 		display: flex;
 		height: 46px;
@@ -963,21 +1002,25 @@ body,
 		line-height: 33px;
 		text-align: center;
 		background: rgba($color: #000000, $alpha: 0.15);
+
 		.img {
 			width: 26px;
 			margin-right: 10px;
 		}
 	}
+
 	.box {
 		margin: auto;
 		width: 200px;
 		height: 200px;
 		margin-top: 27px;
+
 		img {
 			width: 100%;
 			height: 100%;
 		}
 	}
+
 	.area-cp-link {
 		position: absolute;
 		bottom: 0;
@@ -993,21 +1036,25 @@ body,
 		.area-list {
 			clear: both;
 			margin: 15px;
+
 			.item {
 				clear: both;
 				overflow: hidden;
 				margin: 7px 0;
 				font-size: 16px;
 				font-weight: 500;
+
 				.icon {
 					float: left;
 					margin-right: 8px;
 					margin-top: -2px;
 				}
+
 				.font {
 					float: left;
 					margin-right: 8px;
 				}
+
 				.pc {
 					float: left;
 					margin-top: -2px;
@@ -1093,6 +1140,7 @@ body,
 	width: 100%;
 	height: 310px;
 	overflow-y: auto;
+
 	.luck-item {
 		display: flex;
 		padding: 12px 0;
@@ -1100,20 +1148,24 @@ body,
 		border-bottom: 1px solid #f2f2f2;
 		justify-content: space-between;
 		position: relative;
+
 		.header {
 			border-radius: 50%;
 		}
+
 		.luck-king {
 			position: absolute;
 			top: 36px;
 			right: 0px;
 			display: flex;
 			align-items: center;
+
 			img {
 				width: 22px;
 				height: 19px;
 				margin: 0;
 			}
+
 			span {
 				font-weight: 500;
 				font-size: 12px;
@@ -1122,11 +1174,13 @@ body,
 				color: #f5b945;
 			}
 		}
+
 		.userLogo {
 			position: relative;
 			width: 42px;
 			height: 42px;
 			margin-right: 12px;
+
 			.medal {
 				position: absolute;
 				right: -5px;
@@ -1134,19 +1188,23 @@ body,
 				width: 18px;
 				height: 18px;
 			}
+
 			img {
 				width: 100%;
 				height: 100%;
 			}
 		}
+
 		.luck-content {
 			flex: auto;
+
 			.luck-title {
 				font-weight: 500;
 				font-size: 16px;
 				letter-spacing: 0.3px;
 				color: #444444;
 			}
+
 			.luck-time {
 				font-weight: 400;
 				font-size: 12px;
@@ -1155,15 +1213,18 @@ body,
 				color: #9b9b9b;
 			}
 		}
+
 		.luck-money {
 			display: flex;
 			height: 17px;
 			align-items: center;
+
 			img {
 				width: 14px;
 				height: 14px;
 				margin-right: 6px;
 			}
+
 			.luck-money-txt {
 				font-weight: 500;
 				font-size: 14px;
@@ -1173,6 +1234,7 @@ body,
 				color: #444444;
 			}
 		}
+
 		.luck-custom-prize {
 			font-weight: 500;
 			font-size: 14px;
@@ -1180,6 +1242,7 @@ body,
 			color: #f5b945;
 		}
 	}
+
 	.luck-item:last-child {
 		border: 0;
 	}
@@ -1194,9 +1257,11 @@ body,
 	margin-bottom: 13px;
 	background: #7d52fd;
 	border-radius: 0 586px 586px/0 0 104px 104px;
+
 	.img {
 		height: 62px;
 	}
+
 	.expire {
 		color: #ffffff;
 		font-size: 22px;
@@ -1205,6 +1270,7 @@ body,
 		margin-top: 15px;
 		text-align: center;
 	}
+
 	.tips {
 		color: #ffffff;
 		font-size: 22px;
@@ -1212,16 +1278,19 @@ body,
 		line-height: 26px;
 		margin-top: 15px;
 	}
+
 	.win {
 		font-size: 21px;
 		font-weight: 800;
 		color: #fff;
 	}
+
 	.win-money {
 		display: flex;
 		margin-top: -10px;
 		align-items: center;
 		justify-content: center;
+
 		img {
 			width: 44px;
 			height: 44px;
@@ -1229,6 +1298,7 @@ body,
 			border-radius: 50%;
 			border: solid 3px #fff;
 		}
+
 		span {
 			color: #fff;
 			font-size: 60px;
@@ -1237,15 +1307,18 @@ body,
 		}
 	}
 }
+
 .succTitle {
 	display: flex;
 	padding: 5px 0;
 	justify-content: space-between;
 	box-shadow: inset 0px -1px 0px #f2f2f2;
+
 	span {
 		margin: 0 16px;
 		font-size: 12px;
 		color: #b0b0b0;
+
 		&:last-child {
 			text-align: right;
 		}
@@ -1256,6 +1329,7 @@ body,
 	width: 100%;
 	min-height: 373px;
 }
+
 .customBottom {
 	width: 100%;
 	background: #111214;
@@ -1266,28 +1340,34 @@ body,
 	letter-spacing: 0.3px;
 	color: #838383;
 	line-height: 20px;
+
 	.theme {
 		display: flex;
 		height: 20px;
 		align-items: center;
 		justify-content: flex-start;
+
 		.icon {
 			width: 12px;
 		}
+
 		.time2 {
 			margin: 0 4px;
 			color: #1d9bf0;
 		}
 	}
+
 	.winner-info {
 		display: flex;
 		height: 20px;
 		align-items: center;
 		justify-content: flex-start;
+
 		.count {
 			color: #1d9bf0;
 			margin-right: 4px;
 		}
+
 		.prize-name {
 			color: #1d9bf0;
 			margin-left: 4px;

pages/toolbox/index.vue

@@ -4,16 +4,16 @@
 		<div v-if="device == 'chrome' || device == 'no-chrome'" class="content">
 			<v-logo></v-logo>
 			<div class="tool-cover">
-				<img :src="detail.postBizData.linkImagePath" alt="" />
+				<img :src="img_url" alt="" />
 			</div>
 			<!-- 非chrome -->
 			<div v-if="device == 'no-chrome'">
-				<div class="txt">Use chrome browser to access Subway Surfers</div>
+				<div class="txt">Use chrome browser to access {{ detail.postBizData.linkTitle || '' }}</div>
 				<install-chrome></install-chrome>
 			</div>
 			<!-- chrome -->
 			<div v-if="device == 'chrome'">
-				<div class="txt">Use chrome browser to access Subway Surfers</div>
+				<div class="txt">Use chrome browser to access {{ detail.postBizData.linkTitle || '' }}</div>
 				<install-extension :extensionsInstallUrl="config.extensionsInstallUrl"></install-extension>
 			</div>
 		</div>