From 38026e0b1ecd540fb813967a9121aeea6e44834b Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:09:43 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20user=20[WHY]=20=E9=96=8B=E7=99=BC=20Sh?=
 =?UTF-8?q?owEasy=20=E5=89=8D=E8=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. companyInfo手機版
2. 註冊增加判斷帳號是否重複
---
 FrontEnd/pages/user/companyInfo.vue | 4 ++--
 FrontEnd/pages/user/signUp.vue      | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/FrontEnd/pages/user/companyInfo.vue b/FrontEnd/pages/user/companyInfo.vue
index 1382a92..3fc4100 100644
--- a/FrontEnd/pages/user/companyInfo.vue
+++ b/FrontEnd/pages/user/companyInfo.vue
@@ -16,7 +16,7 @@
         </div>
         <div v-else class="tw-mb-[20px] xl:tw-mb-[30px]">
           <!-- 手機版 -->
-          <!-- <div v-for="(item, index) in userCompanyList" :key="`mobile-${index}`"
+          <div v-for="(item, index) in userCompanyList" :key="`mobile-${index}`"
             class="tw-flex tw-justify-between tw-w-full tw-bg-white tw-border tw-border-solid tw-py-[15px] tw-px-[15px] tw-rounded-[10px] tw-border-neutrals-200 xl:tw-px-0 tw-mb-[20px] last:tw-mb-0 md:tw-mb-[30px] xl:tw-hidden">
             <div>
               <div class="tw-pb-[6px] tw-body-4 tw-text-base-primary tw-font-medium">
@@ -45,7 +45,7 @@
                 <img src="~/assets/svg/delete.svg" alt="" class="tw-h-[28px] tw-w-[28px]" />
               </button>
             </div>
-          </div> -->
+          </div>
           <!-- 電腦版 -->
           <div class="xl:tw-grid tw-gap-[15px] tw-grid-cols-[148px_116px_86px_110px_220px] tw-hidden tw-mb-[30px]">
             <div class="tw-text-neutrals-500 tw-body-4">
diff --git a/FrontEnd/pages/user/signUp.vue b/FrontEnd/pages/user/signUp.vue
index 1aa4a16..5359cae 100644
--- a/FrontEnd/pages/user/signUp.vue
+++ b/FrontEnd/pages/user/signUp.vue
@@ -5,6 +5,7 @@
       <p class="tw-body-3 tw-text-neutral-400 tw-mb-[16px] md:tw-mb-[12px]">
         {{ $t("Welcome to ShowEasy!") }}
       </p>
+      
       <p class="tw-body-3 tw-mb-[45px] md:tw-mb-[32px]">
         {{ $t("Already have an account?") }}
         <nuxt-link :to="localePath('/user')" class="primary--text text-decoration-none">{{ $t("Login") }}</nuxt-link>
@@ -31,6 +32,7 @@
       <p class="title">{{ $t("Sign up with Email") }}</p>
       <p class="neutrals--text text--darken-3 text-size-14">
         {{ $t("Welcome to ShowEasy!") }}
+        {{ errorDialog }}
       </p>
       <v-form v-model="valid">
         <v-text-field v-model="userData.FirstName" background-color="neutrals darken-1"
@@ -184,6 +186,10 @@ export default {
           )
           .then((response) => {
           //console.log(JSON.stringify(response));
+          if(response.data.STATUSCODE == "400"){
+            this.errorDialog = true;
+            this.isPageLoading = false;
+          }
           if(response && response.data && response.data.DATA && response.data.DATA.rel){
             let data = response.data.DATA.rel
             if(data){
@@ -203,8 +209,6 @@ export default {
           .catch((err) => {
 
             console.log(err);
-            this.errorDialog = true;
-            this.isPageLoading = false;
 
           });
     },