Merge branch 'master' of https://gitlab.gsstcloud.com/poc/poc-fe into beta

src/views/login/login.vue

@@ -101,6 +101,7 @@ const currentPhoneNumberArea = ref<'+86' | '+852'>('+852')
 const countdownActive = ref(true)
 const isShowCountdown = ref(false)
 const countdownDuration = ref<number>(60000)
+const googleLoginBtnLoading = ref(false)
 
 const phoneNumberAreaOptions = computed(() => {
   return [
@@ -353,6 +354,8 @@ function initializeGoogleSignIn(clientId: string) {
       logo_alignment: 'left',
       locale: systemLanguageStore.currentLanguage,
     })
+
+    googleLoginBtnLoading.value = true
   }
 
   // window.google.accounts.id.prompt((notification: any) => {
@@ -631,9 +634,11 @@ function getGoogleLoginClientId() {
               </button>
             </div>
 
-            <div class="py-[10px] text-center text-[12px] text-[#999999]">{{ t('common_module.or') }}</div>
+            <div v-show="googleLoginBtnLoading" class="py-[10px] text-center text-[12px] text-[#999999]">
+              {{ t('common_module.or') }}
+            </div>
 
-            <div class="flex-center flex">
+            <div v-show="googleLoginBtnLoading" class="flex-center flex">
               <div ref="googleLoginBtnRef"></div>
             </div>
           </div>