From 4f241e223513ee9cca197af6b75b2aeb0fa2e292 Mon Sep 17 00:00:00 2001 From: skytek_xinliang Date: Tue, 29 Sep 2026 10:08:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A7=93=E5=90=8D=E5=8E=BB=E8=AD=98?= =?UTF-8?q?=E5=88=A5=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/layout/DefaultLayout.vue | 30 ++++++++++++------- app/citizen-frontend/src/pages/index.vue | 4 +-- app/citizen-frontend/src/router/index.ts | 5 +--- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/citizen-frontend/src/components/layout/DefaultLayout.vue b/app/citizen-frontend/src/components/layout/DefaultLayout.vue index 08735fd..61ece22 100644 --- a/app/citizen-frontend/src/components/layout/DefaultLayout.vue +++ b/app/citizen-frontend/src/components/layout/DefaultLayout.vue @@ -41,16 +41,19 @@ - - {{ displayUserName }} - - {{ store.userProfile.phone }} @@ -100,14 +103,14 @@ to="/" /> - + /> --> import { ref, watch } from "vue"; import { useRoute, useRouter } from "vue-router"; -import { useDisplayUserName } from "@/composables/useDisplayUserName"; import { APPOINTMENT_ENABLED, BODY_COMPOSITION_ENABLED, @@ -312,7 +314,6 @@ const store = useAppStore(); const courseStore = useCourseStore(); const router = useRouter(); const route = useRoute(); -const displayUserName = useDisplayUserName(store.userProfile); const drawer = ref(false); const activeTab = ref("home"); @@ -388,4 +389,11 @@ async function handleLogout() { .border-top { border-top: 1px solid rgba(0, 0, 0, 0.08); } + +.profile-avatar-icon { + width: 28px; + height: 28px; + color: white; + fill: currentcolor; +} diff --git a/app/citizen-frontend/src/pages/index.vue b/app/citizen-frontend/src/pages/index.vue index 87690c3..b990921 100644 --- a/app/citizen-frontend/src/pages/index.vue +++ b/app/citizen-frontend/src/pages/index.vue @@ -9,7 +9,7 @@ - {{ displayUserName }} + {{ store.userProfile.phone }} 資料更新於 {{ todayTimeString }} @@ -383,7 +383,6 @@ import Layout from "@/components/layout/DefaultLayout.vue"; import ModuleRouterCard from "@/components/ModuleRouterCard.vue"; import PlatformIntroduction from "@/components/PlatformIntroduction.vue"; import PhysicalFitnessSummary from "@/components/PhysicalFitnessSummary.vue"; -import { useDisplayUserName } from "@/composables/useDisplayUserName"; import { APPOINTMENT_ENABLED, BODY_COMPOSITION_ENABLED, @@ -409,7 +408,6 @@ const physicalFitnessReceivedAt = ref(null); const physicalFitnessLoading = ref(false); const physicalFitnessError = ref(""); -const displayUserName = useDisplayUserName(store.userProfile); const physicalFitnessRadarData = computed(() => calculatePhysicalFitnessRadar(physicalFitnessItems.value), ); diff --git a/app/citizen-frontend/src/router/index.ts b/app/citizen-frontend/src/router/index.ts index 99f6f11..0cb12dd 100644 --- a/app/citizen-frontend/src/router/index.ts +++ b/app/citizen-frontend/src/router/index.ts @@ -6,7 +6,6 @@ import CheckinDetail from "@/pages/checkinDetail.vue"; import Course from "@/pages/course.vue"; import Index from "@/pages/index.vue"; import Login from "@/pages/login.vue"; -import Profile from "@/pages/profile.vue"; import Register from "@/pages/register.vue"; import SelfAssessment from "@/pages/self-assessment.vue"; import { @@ -55,9 +54,7 @@ const router = createRouter({ }, { path: "/profile", - name: "profile", - component: Profile, - meta: { requiresAuth: true, title: "個人資料修改|運動玩轉健康力" }, + redirect: { name: "home" }, }, { path: "/body-composition",