hwq 3 years ago
parent
commit
2327cca0a0
1 changed files with 0 additions and 12 deletions
  1. 0 12
      pages/index/node.vue

+ 0 - 12
pages/index/node.vue

@@ -285,7 +285,6 @@ page {
 	}
 }
 .psw-wrapper {
-<<<<<<< HEAD
 		width: 548rpx;
 		height: 344rpx;
 		background-color: #FFFFFF;
@@ -315,17 +314,6 @@ page {
 		.psw-qd {
 			color:#45969B;
 		}
-=======
-	width: 548rpx;
-	height: 344rpx;
-	background-color: #ffffff;
-	.psw-title {
-		width: 100%;
-		font-size: 35rpx;
-		padding: 43rpx 0 49rpx;
-		text-align: center;
-		font-weight: 800;
->>>>>>> 55401fd4b35f86aff3b25e611b15e4543f0fa312
 	}
 	.psw-ipt {
 		display: block;