From 29d5b9e7db3a84c432c4cb94b53a38fb30271d93 Mon Sep 17 00:00:00 2001 From: li Date: Sat, 14 Mar 2026 20:56:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20H5=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=85=A8=E9=93=BE=E8=B7=AF=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E2=80=94=20=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81/=E9=A6=96?= =?UTF-8?q?=E9=A1=B5key/=E8=B4=A6=E6=88=B7=E5=AD=97=E6=AE=B5/=E8=86=B3?= =?UTF-8?q?=E9=A3=9F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Client/AuthController.php | 2 +- .../Controllers/Client/HomeController.php | 14 ++--- client/src/views/home/index.vue | 2 +- client/src/views/meal/index.vue | 6 +- client/src/views/my/Account.vue | 61 ++++++++++++------- 5 files changed, 51 insertions(+), 34 deletions(-) diff --git a/backend/app/Http/Controllers/Client/AuthController.php b/backend/app/Http/Controllers/Client/AuthController.php index 2eb06e2..aae9ab2 100644 --- a/backend/app/Http/Controllers/Client/AuthController.php +++ b/backend/app/Http/Controllers/Client/AuthController.php @@ -31,7 +31,7 @@ class AuthController extends Controller return $this->error('手机号或密码错误', 40100, 401); } - if ($customer->status !== 1) { + if (in_array($customer->status, [4, 5])) { return $this->error('账号已停用，请联系门店', 40101, 403); } diff --git a/backend/app/Http/Controllers/Client/HomeController.php b/backend/app/Http/Controllers/Client/HomeController.php index 805faa2..d7cc946 100644 --- a/backend/app/Http/Controllers/Client/HomeController.php +++ b/backend/app/Http/Controllers/Client/HomeController.php @@ -69,12 +69,12 @@ class HomeController extends Controller $nannyOrder->load('nanny:id,name,level,phone'); } - return $this->success(compact( - 'customerInfo', - 'careRecords', - 'todayMeals', - 'contract', - 'nannyOrder' - )); + return $this->success([ + 'customer' => $customerInfo, + 'care_records' => $careRecords, + 'today_meals' => $todayMeals, + 'contract' => $contract, + 'nanny_order' => $nannyOrder, + ]); } } diff --git a/client/src/views/home/index.vue b/client/src/views/home/index.vue index b9ce254..1368108 100644 --- a/client/src/views/home/index.vue +++ b/client/src/views/home/index.vue @@ -21,7 +21,7 @@ const todayMeals = computed(() => homeData.value?.today_meals || []) const latestRecords = computed(() => homeData.value?.care_records || []) const nannyOrder = computed(() => homeData.value?.nanny_order) -const mealTypeLabel = { 1: '早餐', 2: '上午茶', 3: '午餐', 4: '下午茶', 5: '晚餐', 6: '宵夜' } +const mealTypeLabel = { 1: '早餐', 2: '午餐', 3: '下午茶', 4: '晚餐', 5: '宵夜' } const features = [ { label: '月子餐', bg: '#fff0f4', color: '#f43f5e', icon: 'food-o', path: '/meal' }, diff --git a/client/src/views/meal/index.vue b/client/src/views/meal/index.vue index 3283859..6ca48ec 100644 --- a/client/src/views/meal/index.vue +++ b/client/src/views/meal/index.vue @@ -10,9 +10,9 @@ const currentPlan = ref(null) const reviewForm = ref({ rating: 5, content: '' }) const submitting = ref(false) -const mealTypeLabel = { 1: '早餐', 2: '上午茶', 3: '午餐', 4: '下午茶', 5: '晚餐', 6: '宵夜' } -const mealTypeBg = { 1: '#fff0f4', 2: '#fffbeb', 3: '#f0fdf4', 4: '#f0f9ff', 5: '#eff6ff', 6: '#faf5ff' } -const mealTypeColor = { 1: '#f43f5e', 2: '#f59e0b', 3: '#10b981', 4: '#0ea5e9', 5: '#3b82f6', 6: '#8b5cf6' } +const mealTypeLabel = { 1: '早餐', 2: '午餐', 3: '下午茶', 4: '晚餐', 5: '宵夜' } +const mealTypeBg = { 1: '#fff0f4', 2: '#f0fdf4', 3: '#f0f9ff', 4: '#eff6ff', 5: '#faf5ff' } +const mealTypeColor = { 1: '#f43f5e', 2: '#10b981', 3: '#0ea5e9', 4: '#3b82f6', 5: '#8b5cf6' } onMounted(fetchList) diff --git a/client/src/views/my/Account.vue b/client/src/views/my/Account.vue index 2de8f47..b8f5a40 100644 --- a/client/src/views/my/Account.vue +++ b/client/src/views/my/Account.vue @@ -1,50 +1,67 @@