Merge branch 'dev_1.0.4_ui' of DeNet/de-net-official into master

pages/index.vue

@@ -65,7 +65,7 @@
 						<img v-else src="/svg/icon-twitter.svg" alt />
 						<div class="luck-content">
 							<div class="luck-title">{{ item.simpleUserInfoVO.nickName || 'Twitter User' }}</div>
-							<div class="luck-time">{{ formatTime(item.receiveTimestamp) }}</div>
+							<div class="luck-time">{{ formatTime(item.receiveTimestamp, 'MM-DD HH:mm') }}</div>
 						</div>
 						<div class="luck-money">
 							<img :src="item.currencyIconPath" alt />
@@ -262,7 +262,7 @@ export default {
 				}
 			},
 			currencyIconPath: '',
-			title: '',
+			title: 'DeNet Giveaway',
 			twitterTitle: 'DeNet: An Easy Web3 Tool For GIVEAWAY / AIRDROP',
 			jumpUrl: jumpUrl,
 			status: '',
@@ -1058,7 +1058,7 @@ body,
 		border-radius: 2rem;
 		// background: red;
 		overflow-y: hidden;
-		box-shadow: 0 0 5px #888888;
+		box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.1);
 		background: #fff;
 
 
@@ -1122,7 +1122,7 @@ body,
 				text-align: center;
 				color: #fff;
 				background: #389AFF;
-				border-radius: 0 586px 586px/0 0 104px 104px;
+				border-radius: 0 586px 586px/0 0 164px 164px;
 
 				.txt {
 					padding-top: 8.5rem;
@@ -1166,9 +1166,10 @@ body,
 			padding: 14px 0 11px 0;
 			background: #fff;
 			display: flex;
+            font-weight: 500;
 			justify-content: space-between;
 			color: #B0B0B0;
-			border-bottom: 1px solid #D1D1D1;
+			border-bottom: 1px solid #F2F2F2;
 		}
 
 
@@ -1180,7 +1181,7 @@ body,
 				display: flex;
 				padding: 12px 0;
 				margin: 0 16px;
-				border-bottom: 1px solid #d1d1d1;
+				border-bottom: 1px solid #F2F2F2;
 				justify-content: space-between;
 				position: relative;
 
@@ -1224,14 +1225,14 @@ body,
 						font-size: 16px;
 						letter-spacing: 0.3px;
 						color: #444444;
+                        margin-bottom: 5px;
 					}
 
 					.luck-time {
 						font-weight: 400;
 						font-size: 12px;
 						line-height: 14px;
-
-						color: #9b9b9b;
+						color: #B0B0B0;
 					}
 				}
 
@@ -1304,7 +1305,7 @@ body,
 	}
 
 	.redPacket2 {
-		left: 30.6rem;
+		left: 43.6rem;
 		margin-left: -18rem;
 	}
 
@@ -1318,7 +1319,7 @@ body,
 	.install {
 		position: absolute;
 		top: 20rem;
-		left: 78.5rem;
+		left: 73.5rem;
 
 		.title {
 			font-size: 4.8rem;
@@ -1332,7 +1333,7 @@ body,
 			width: 40rem;
 			height: 3.3rem;
 			line-height: 3.3rem;
-
+            font-weight: normal;
 			span {
 				font-size: 1.4rem;
 			}