From 90875849eb280eb8eb68331698b573aa44dd4eaa Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 14 十二月 2021 16:46:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
PAMapp/pages/login/index.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/PAMapp/pages/login/index.vue b/PAMapp/pages/login/index.vue
index 863d242..f7c331f 100644
--- a/PAMapp/pages/login/index.vue
+++ b/PAMapp/pages/login/index.vue
@@ -197,8 +197,7 @@
@scroll="detectContractReadStatus">
<h3>����犖鞈��鈭��</h3>
<p class="mt-10">
- �摰�犖鞈��風瘜��������犖鞈����������
- �銝�����
+ �摰�犖鞈��風瘜��������犖鞈���������銝�����
<p>
<p class="mt-10">
@@ -217,13 +216,11 @@
</p>
<p class="mt-10">
- �������������平���暑�������銝剛瘞���������犖鞈�
- ����
+ �������������平���暑�������銝剛瘞���������犖鞈���
</p>
<p class="mt-10">
- 鈭���������摰���甈∩誑憭�璆凋�撱��恐撠����誑��隞
- ���������銋����嚗�������犖鞈���
+ 鈭���������摰���甈∩誑憭�璆凋�撱��恐撠����誑��隞���������銋����嚗�������犖鞈���
</p>
<p class="mt-10">
@@ -356,14 +353,14 @@
phoneNumber = '';
otpCode = '';
onPhoneVerifyStep: 'APPLY_OTP' | 'INPUT_OTP' | 'SUBMIT_OTP' = 'APPLY_OTP';
- otpCounterSec = 900;
+ otpCounterSec = 300;
otpResendCounter = 30;
otpInterval: any;
phoneOtpInfo!: OtpInfo;
email = '';
onEmailVerifyResendStatus: 'APPLY_OTP' | 'CAN_RESEND' = 'APPLY_OTP';
- emailCounterSec = 900;
+ emailCounterSec = 300;
emailResendCounter = 30;
emailOtpCode = '';
emailResendInterval: any;
@@ -610,11 +607,11 @@
if (type === 'MOBILE') {
clearInterval(this.otpInterval);
this.otpResendCounter = 30;
- this.otpCounterSec = 900;
+ this.otpCounterSec = 300;
} else {
clearInterval(this.emailResendInterval);
this.emailResendCounter = 30;
- this.emailCounterSec = 900;
+ this.emailCounterSec = 300;
}
}
@@ -747,6 +744,7 @@
$ALIGN_PADDING: 60px;
$TOP_CONTENT_HEIGHT: 186px;
$BOTTOM_CONTENT_HEIGHT: 131px;
+ // text-align:start;
max-height: calc(100vh - $DEVICE_EXTRA_HEIGHT - $ALIGN_PADDING - $TOP_CONTENT_HEIGHT - $BOTTOM_CONTENT_HEIGHT);
overflow-y: scroll;
border-radius: 6px;
--
Gitblit v1.8.0