From 3960b9d388065f00b9a73288fe544e05c1d33a74 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 29 Mar 2023 20:44:11 +0700 Subject: [PATCH] set path api server --- src/api/index.ts | 2 +- .../01_exam/components/Form/Information.vue | 17 +++-- src/modules/01_exam/views/ExamDetail.vue | 62 +++++++++---------- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index ee690bf..3b3dd73 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -18,7 +18,7 @@ const config = ref({ }, production: { // API_URI: "https://localhost:5010", - API_URI: `${window.location.protocol}//api-${window.location.host}/api/v1`, + API_URI: `${window.location.protocol}//${window.location.host}/api/v1`, MEET_URI: 'meet.frappet.com' } }) diff --git a/src/modules/01_exam/components/Form/Information.vue b/src/modules/01_exam/components/Form/Information.vue index c1ac6d5..5d43fd4 100644 --- a/src/modules/01_exam/components/Form/Information.vue +++ b/src/modules/01_exam/components/Form/Information.vue @@ -95,9 +95,7 @@ lazy-rules :readonly="!(status == 'register' || status == 'rejectRegister')" :borderless="!(status == 'register' || status == 'rejectRegister')" - :model-value=" - informaData.birthDate == null ? null : date2Thai(informaData.birthDate) - " + :model-value="informaData.birthDate == null ? null : date2Thai(informaData.birthDate)" :rules="[(val) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`]" :label="`${'วัน/เดือน/ปี เกิด'}`" > @@ -301,7 +299,7 @@ :label="`${'โทรศัพท์มือถือ'}`" /> -
+
{ informaData.value.tel = data.telephone informaData.value.knowledge = data.knowledge }) - .catch(() => {}) + .catch(() => { + informaData.value.email = keycloak.tokenParsed == null ? '' : keycloak.tokenParsed.email + informaData.value.firstname = + keycloak.tokenParsed == null ? '' : keycloak.tokenParsed.given_name + informaData.value.lastname = + keycloak.tokenParsed == null ? '' : keycloak.tokenParsed.family_name + }) .finally(() => { loader.value = false }) @@ -600,7 +605,7 @@ const getClass = (val: boolean) => { opacity: 1; } -.q-field__bottom{ +.q-field__bottom { padding: 5px 10px 0px 0px; } diff --git a/src/modules/01_exam/views/ExamDetail.vue b/src/modules/01_exam/views/ExamDetail.vue index c6127a3..1a0b7fe 100644 --- a/src/modules/01_exam/views/ExamDetail.vue +++ b/src/modules/01_exam/views/ExamDetail.vue @@ -33,7 +33,7 @@ title="ข้อมูลสมัครสอบ" :icon="stepRaw >= 2 ? (stepRaw == 2 ? 'mdi-pencil' : 'mdi-check-bold') : 'mdi-account'" > - + @@ -44,7 +44,7 @@ title="ชำระค่าธรรมเนียม" :icon="stepRaw >= 3 ? (stepRaw == 3 ? 'mdi-pencil' : 'mdi-check-bold') : 'mdi-receipt'" > - + @@ -55,7 +55,7 @@ title="สำเร็จ" :icon="stepRaw >= 4 ? 'mdi-check-bold' : 'mdi-flag-variant'" > - + @@ -92,8 +92,8 @@ const status = ref('register') const modalConsend = ref(false) onMounted(async () => { - stepRaw.value = 2 - step.value = 2 + // stepRaw.value = 2 + // step.value = 2 await fetchPeriodExam() await candidateCheck() }) @@ -200,57 +200,57 @@ const doLogout = () => { \ No newline at end of file +