Merge branch 'ZHNY_WW' into ZHNY_DCF

src/components/jt-popup/jt-popup2.vue

@@ -93,7 +93,7 @@
 		// right: 40rem;
 		top: 90rem;
 		// height: 490rem;
-		height: calc((100% - 95rem)/3);
+		height: calc((100% - 115rem)/3);
 		width: 350rem;
 		// padding: 10rem;
 		background-color: rgba(0, 45, 66, 0.5);
@@ -108,7 +108,7 @@
 		.header {
 			height: 41rem;
 			width: calc(100% + 20rem);
-			background: url('@/assets/images/300x30小标题.png') no-repeat;
+			background: url('@/assets/images/tcheader.png') no-repeat;
 			background-size: 100%;
 			margin: -10rem;
 			margin-bottom: 0rem;
@@ -220,9 +220,9 @@
 	.popup-main2 {
 		position: absolute;
 		// right: 1rem;
-		top: calc(calc(100% - 95rem) / 3 + 90rem);
+		top: calc(calc(100% - 115rem) / 3 + 90rem);
 		// height: 490rem;
-		height: calc((100% - 95rem) / 3);
+		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		background-color: rgba(0, 45, 66, 0.5);
@@ -237,7 +237,7 @@
 		.header2 {
 			height: 41rem;
 			width: calc(100% + 20rem);
-			background: url('@/assets/images/300x30小标题.png') no-repeat;
+			background: url('@/assets/images/tcheader.png') no-repeat;
 			background-size: 100%;
 			margin: -10rem;
 			margin-bottom: 0rem;
@@ -349,9 +349,9 @@
 	.popup-main3 {
 		position: absolute;
 		// right: 1rem;
-		top: calc(calc(100% - 95rem) / 3 + calc(100% - 95rem) / 3 + 90rem);
+		top: calc(calc(100% - 115rem) / 3 + calc(100% - 115rem) / 3 + 90rem);
 		// height: 490rem;
-		height: calc((100% - 95rem) / 3);
+		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		background-color: rgba(0, 45, 66, 0.5);
@@ -366,7 +366,7 @@
 		.header3 {
 			height: 41rem;
 			width: calc(100% + 20rem);
-			background: url('@/assets/images/300x30小标题.png') no-repeat;
+			background: url('@/assets/images/tcheader.png') no-repeat;
 			background-size: 100%;
 			margin: -10rem;
 			margin-bottom: 0rem;

src/components/jt-popup/jt-popup3.vue

@@ -91,9 +91,9 @@
 	.popup-main {
 		position: absolute;
 		right: 1rem;
-		top: 70rem;
+		top: 90rem;
 		// height: 490rem;
-		height: calc((100% - 95rem) / 3);
+		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		background-color: rgba(0, 45, 66, 0.5);
@@ -108,7 +108,7 @@
 		.header {
 			height: 41rem;
 			width: calc(100% + 20rem);
-			background: url('@/assets/images/300x30小标题.png') no-repeat;
+			background: url('@/assets/images/tcheader.png') no-repeat;
 			background-size: 100%;
 			margin: -10rem;
 			margin-bottom: 0rem;
@@ -220,9 +220,9 @@
 	.popup-main2 {
 		position: absolute;
 		right: 1rem;
-		top: calc(calc(100% - 95rem) / 3 + 70rem);
+		top: calc(calc(100% - 115rem) / 3 + 90rem);
 		// height: 490rem;
-		height: calc((100% - 95rem) / 3);
+		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		background-color: rgba(0, 45, 66, 0.5);
@@ -237,7 +237,7 @@
 		.header2 {
 			height: 41rem;
 			width: calc(100% + 20rem);
-			background: url('@/assets/images/300x30小标题.png') no-repeat;
+			background: url('@/assets/images/tcheader.png') no-repeat;
 			background-size: 100%;
 			margin: -10rem;
 			margin-bottom: 0rem;
@@ -349,9 +349,9 @@
 	.popup-main3 {
 		position: absolute;
 		right: 1rem;
-		top: calc(calc(100% - 95rem) / 3 + calc(100% - 95rem) / 3 + 70rem);
+		top: calc(calc(100% - 115rem) / 3 + calc(100% - 115rem) / 3 + 90rem);
 		// height: 490rem;
-		height: calc((100% - 95rem) / 3);
+		height: calc((100% - 115rem) / 3);
 		width: 350rem;
 		// padding: 10rem;
 		background-color: rgba(0, 45, 66, 0.5);
@@ -366,7 +366,7 @@
 		.header3 {
 			height: 41rem;
 			width: calc(100% + 20rem);
-			background: url('@/assets/images/300x30小标题.png') no-repeat;
+			background: url('@/assets/images/tcheader.png') no-repeat;
 			background-size: 100%;
 			margin: -10rem;
 			margin-bottom: 0rem;