From e4c188dc8d149d7ffb2cf2610a321c9849eb09e7 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 26 七月 2022 13:59:47 +0800
Subject: [PATCH] enhance: 客戶登入驗證機制

---
 PAMapp/pages/login/index.vue |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/PAMapp/pages/login/index.vue b/PAMapp/pages/login/index.vue
index 7b14692..0297782 100644
--- a/PAMapp/pages/login/index.vue
+++ b/PAMapp/pages/login/index.vue
@@ -58,9 +58,9 @@
             </div>
           </div>
 
-          <div class="pam-paragraph">
+          <div class="pam-paragraph" v-if="(!showPhoneOtpCodeField && !showEmailVerifyField)">
             <div class="pam-consultant-login__title">
-              <div>撽�Ⅳ <span class="text--dark-blue fs-16">(����之撠神)</span></div>
+              <div>�����Ⅳ <span class="text--dark-blue fs-16">(����之撠神)</span></div>
               <div class="text--primary fs-16 cursor--pointer fix-chrome-click--issue"
                 style="margin-left: 16px"
                 @click="regenerateImgOfVerification">������</div>
@@ -113,17 +113,18 @@
                     v-if="otpResendCounter !== 0"
                   >({{ otpResendCounter }})</span>
                 </el-button>
+
               </el-row>
             </div>
 
             <el-row>
               <el-button
                   v-if="onPhoneVerifyStep === 'APPLY_OTP'"
-                  :disabled="!phoneNumber || !phoneValid || !verificationCode || verificationCode.length !== 4"
+                  :disabled="!phoneNumber || !phoneValid || verificationCode.length !== 4"
                   @click="applyOtpVerification('MOBILE')"
                   icon="icon-arrow"
                 >
-                  ����Ⅳ
+                  ��� OTP 撽�Ⅳ
                 </el-button>
             </el-row>
 
@@ -165,13 +166,14 @@
               </el-button>
             </el-row>
 
-            <el-row v-show="!showEmailVerifyField">
+            <el-row>
               <el-button
-                  :disabled="!email || !emailValid || !verificationCode || verificationCode.length !== 4"
+                  v-if="onEmailVerifyResendStatus === 'APPLY_OTP'"
+                  :disabled="!email || !emailValid || verificationCode.length !== 4"
                   @click="applyOtpVerification('EMAIL')"
                   icon="icon-arrow"
                 >
-                  ����Ⅳ
+                  ��� OTP 撽�Ⅳ
                 </el-button>
             </el-row>
           </template>
@@ -595,7 +597,6 @@
 
   resentOtp(type: string) {
     this.resetOtpSetting(type);
-    this.applyOtpVerification(type);
   }
 
   deleteOtpInfo(type: string) {
@@ -617,10 +618,12 @@
       clearInterval(this.otpInterval);
       this.otpResendCounter = 30;
       this.otpCounterSec = 300;
+      this.onPhoneVerifyStep = 'APPLY_OTP';
     } else {
       clearInterval(this.emailResendInterval);
       this.emailResendCounter = 30;
       this.emailCounterSec = 300;
+      this.onEmailVerifyResendStatus = 'APPLY_OTP';
     }
   }
 

--
Gitblit v1.8.0