huangxiaojing %!s(int64=3) %!d(string=hai) anos
pai
achega
684b7dc751

+ 15 - 18
microserviceUserH5/static/css/replacementActivities.css

@@ -1,12 +1,12 @@
-@media screen and (max-width: 750px) {
+@media screen and (max-width: 1280px) {
   html {
     font-size: calc(100vw / 7.5);
   }
 }
 
-@media screen and (min-width: 750px) {
+@media screen and (min-width: 1280px) {
   html {
-    font-size: calc(450px / 7.5);
+    font-size: calc(1280px / 7.5);
   }
 }
 
@@ -75,7 +75,7 @@ ul, li {
 }
 .header{
   width: 6.64rem;
-  height: 5.7rem;
+  height: 6.53rem;
   margin: 0.17rem auto 0;
   overflow: hidden;
   border: 1px solid #62767B;
@@ -109,7 +109,7 @@ ul, li {
 .input-container {
   margin: 0.3rem 0.2rem;
   border-radius: 0.2rem;
-  height: 4.04rem;
+  height: 4.9rem;
   background-color: #193B45;
   overflow: hidden;
   position: relative;
@@ -137,11 +137,12 @@ ul, li {
   overflow: hidden;
   display: flex;
   align-items: center;
+  justify-content: space-between;
   position: relative;
   margin-top: 0.4rem;
 }
 .options{
-  width: 4.4rem;
+  width: 4.14rem;
   height: 1.36rem;
   position: absolute;
   top: 0.9rem;
@@ -177,15 +178,17 @@ input:disabled, input[disabled] {
   overflow: hidden;
   display: flex;
   align-items: center;
+  justify-content: space-between;
   margin-top: 0.3rem;
 }
 .login-row-password{
   overflow: hidden;
   display: flex;
+  justify-content: space-between;
   align-items: center;
 }
 .login-row-title{
-  margin: 0 0.45rem 0 0.3rem;
+  margin-left: 0.3rem;
   font-size: 0.3rem;
   font-weight: 400;
   color: #63A1B0;
@@ -200,8 +203,8 @@ input:disabled, input[disabled] {
   border: 1px solid #e72f2f !important;
 }
 .login-row-ipt{
-  width: 4.4rem;
-  height: 0.5rem;
+  width: 4.14rem;
+  height: 0.59rem;
   border-radius: 0.08rem;
   outline: none;
   background: #1A3A43;
@@ -211,20 +214,14 @@ input:disabled, input[disabled] {
   font-size: 0.24rem;
   color: #63A1B0;
   line-height: 0.05rem;
+  margin-right: 0.3rem;
 }
-.tip-text1 {
+.tip-text1, .tip-text2, .tip-text3 {
   font-size: 0.24rem;
   color: #e72f2f;
   height: 0.3rem;
   line-height: 0.3rem;
-  padding-left: 1.35rem;
-}
-.tip-text2 {
-  font-size: 0.24rem;
-  color: #e72f2f;
-  height: 0.3rem;
-  line-height: 0.3rem;
-  padding-left: 1.35rem;
+  padding-left: 1.7rem;
 }
 input:-ms-input-placeholder {
   color: #63A1B0;

+ 18 - 5
microserviceUserH5/vcloud/invite.html

@@ -61,6 +61,11 @@
 						<input class="login-row-ipt" type="password" id="password" placeholder="请输入密码" />
 					</div>
 					<div class="tip-text2"></div>
+					<div class="login-row-password">
+						<div class="login-row-title">确认密码</div>
+						<input class="login-row-ipt" type="password" id="check" placeholder="请重新输入密码" />
+					</div>
+					<div class="tip-text3"></div>
 					<div class="form-btn" id="form-btn"></div>
 					<div id="mpanel2"></div>
 				</div>
@@ -72,7 +77,7 @@
 		<div class="mt50">
 			<img class="w670h476" src="../static/img/replacementActivities/inviteeReward.png" alt="">
 		</div>
-		<div class="mt50">
+		<div class="mt50" style="margin-bottom: 0.71rem;">
 			<img class="w666h864" src="../static/img/replacementActivities/mattersNeedAttention.png" alt="">
 		</div>
 		<div class="mask1">
@@ -119,9 +124,7 @@
 		}
 		let timer, flag = true;
 		let entryPageTime = new Date().Format("yyyy-MM-dd hh:mm:ss");
-		let fromType = 0,
-			account = '',
-			password = '';
+		let fromType = 0, account = '', password = '', checkPass = '';
 		var url = window.location.href;
 		url = url.split('/')
 
@@ -340,6 +343,8 @@
 					account = account.replace(/\s+/g, "");
 					password = $('#password').val();
 					password = password.replace(/\s+/g, "");
+					checkPass = $('#check').val();
+					checkPass = checkPass.replace(/\s+/g, "");
 					if (!account) {
 						$('.tip-text1').text('账号格式不正确,请重新输入!');
 						$('#account').addClass('br');
@@ -357,12 +362,20 @@
 						$('#account').removeClass('br')
 					}
 					if (!password) {
-						$('.tip-text2').text('密码为空,请重新输入');
+						$('.tip-text2').text('密码为空,请重新输入');
 						$('#password').addClass('br');
 						return false
 					} else {
 						$('.tip-text2').text('');
 						$('#password').removeClass('br');
+					}
+					if (checkPass !== password) {
+						$('.tip-text3').text('两次密码不一致,请重新输入!');
+						$('#check').addClass('br');
+						return false
+					} else {
+						$('.tip-text3').text('');
+						$('#check').removeClass('br');
 						return true
 					}
 				},