From cafd8ec535dfec3db075ed61539a3f0dd1cd6c0c Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期三, 01 十二月 2021 11:34:58 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.pollex.com.tw:29418/pcalife/PAM

---
 PAMapp/pages/login/index.vue |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/PAMapp/pages/login/index.vue b/PAMapp/pages/login/index.vue
index 93525b9..988413c 100644
--- a/PAMapp/pages/login/index.vue
+++ b/PAMapp/pages/login/index.vue
@@ -283,7 +283,9 @@
       </el-dialog>
 
       <PopUpFrame class="pam-popUpFrame"
-        :isOpen.sync="emailOtpConfirmVisable">
+        :isOpen.sync="emailOtpConfirmVisable"
+        :drawerSize="'35%'"
+      >
         <div class="pam-popUp-title text--center">撌脣������</div>
         <div class="pam-popUp-title text--center">{{email}}</div>
         <div class="pam-popUp-title text--center">隢��摮隞嗡蒂摰������</div>
@@ -298,10 +300,15 @@
       </PopUpFrame>
 
       <PopUpFrame class="pam-popUpFrame"
-        :isOpen.sync="registerSuccessConfirmVisable">
+        :isOpen.sync="registerSuccessConfirmVisable"
+        @closePopUp="confirmApplySuccess"
+        :drawerSize="'35%'"
+      >
           <div class="pam-popUp-title text--center">
             甇∟�����������垣閰ｇ�“���誑�����{ connectDevice === 'MOBILE' ? '����Ⅳ' : 'Email'}}���蝜�
           </div>
+          <div class="pam-popUp-txt text--center mb-10 mt-5"
+          >�撠�����</div>
           <div class="pam-popUp-confirm-bolck pam-paragraph">
             <div class="text--center">
               <el-button
@@ -313,9 +320,14 @@
       </PopUpFrame>
 
       <PopUpFrame class="pam-popUpFrame"
-        :isOpen.sync="phoneSuccessConfirmVisable">
-          <div class="pam-popUp-title text--center mb-50"
+        :isOpen.sync="phoneSuccessConfirmVisable"
+        @closePopUp="confirmApplySuccess"
+        :drawerSize="'30%'"
+      >
+          <div class="pam-popUp-title text--center"
           >甇∟�������</div>
+          <div class="pam-popUp-txt text--center mb-30 mt-5 xsTxt"
+          >�撠�����</div>
           <div class="pam-popUp-confirm-bolck pam-paragraph">
             <div class="text--center">
               <el-button
@@ -478,6 +490,7 @@
       this.storageRole(Role.USER);
       this.storagePhoneOrEmail(registerInfo);
       this.registerSuccessConfirmVisable = true;
+      this.autoRedirect();
     }).catch(() => {
       this.applyAccount_onAction = false;
     });
@@ -486,7 +499,13 @@
   confirmApplySuccess(): void {
     this.phoneSuccessConfirmVisable = false;
     this.registerSuccessConfirmVisable = false;
-    this.$router.go(-1);
+    this.$router.push('/');
+  }
+
+  private autoRedirect() {
+    setTimeout(() => {
+      this.$router.push('/')
+    }, 3000)
   }
 
   login() {
@@ -496,6 +515,7 @@
       this.storageIdToken(res.data.id_token);
       this.storageRole(Role.USER);
       this.phoneSuccessConfirmVisable = true;
+      this.autoRedirect();
       this.storagePhoneOrEmail(this.setRegisterInfo());
     }).catch(error => {
       this.checkHttpErrorStatus(error);
@@ -714,18 +734,6 @@
   }
 }
 
-  .pam-register-dialog__contract {
-    $DEVICE_EXTRA_HEIGHT: 42px;
-    $ALIGN_PADDING: 60px;
-    $TOP_CONTENT_HEIGHT: 186px;
-    $BOTTOM_CONTENT_HEIGHT: 131px;
-    max-height: calc(100vh - $DEVICE_EXTRA_HEIGHT - $ALIGN_PADDING - $TOP_CONTENT_HEIGHT - $BOTTOM_CONTENT_HEIGHT);
-    overflow-y: scroll;
-    border-radius: 6px;
-    border: 1px solid #707070;
-    padding: 20px;
-  }
-
   .pam-radio {
     color: $PRIMARY_RED;
     align-items: center;
@@ -781,6 +789,12 @@
       font-size: 20px;
       line-height: 27px;
   }
+
+  .pam-popUp-txt {
+    font-size: 18px;
+    color: $MID_GREY;
+  }
+
   .disabled {
     color: #A7A8AA;
   }

--
Gitblit v1.8.0