Merge branch 'master' of ssh://1582597470426922.onaliyun.com@s1.nsloop.com:29418/web_TracerMethodology

pages/login/login.vue

@@ -89,31 +89,33 @@
 	.login-page {
 		height: 100%;
 		background-color: #FFFFFF;
-
-		.pic{
-			 height: 281.25rpx;
-			 width: 430rpx;
-			 float: right;
-		}
-		.title-top{
-			 height: 45rpx;
-			 font-size: 45rpx;
-			 font-weight: bold;
-			 margin-top: 250rpx;
-			 margin-left: 62.5rpx;
-			 font-family: SourceHanSansCN-Bold, SourceHanSansCN;
-			 color: #2E2F33;
-			 float: left;
-		}
-		.title-buttom{
-			 height: 45rpx;
-			 font-size: 45rpx;
-			 font-family: SourceHanSansCN-Bold, SourceHanSansCN;
-			 font-weight: bold;
-			 color: #2E2F33;
-			 float: left;
-			 margin-left: 62.5rpx;
-			 margin-top: 40rpx;
+		.top-box {
+			display: flex;
+			flex-direction: column;
+			padding-left: 62.5rpx;
+			.pic{
+				position: absolute;
+				top: 0;
+				right: 0;
+			  width: 430rpx;
+				height: 281.25rpx;
+			}
+			.title-top{
+				height: 45rpx;
+				font-size: 45rpx;
+				font-weight: bold;
+				margin-top: 250rpx;
+				font-family: SourceHanSansCN-Bold, SourceHanSansCN;
+				color: #2E2F33;
+			}
+			.title-buttom{
+				 margin-top: 40rpx;
+				 height: 45rpx;
+				 font-size: 45rpx;
+				 font-family: SourceHanSansCN-Bold, SourceHanSansCN;
+				 font-weight: bold;
+				 color: #2E2F33;
+			}
 		}
 		.main-content{
 			 margin-top: 37.5rpx;