diff --git a/apps/miniprogram/src/pages/pkg-profile/consents/index.scss b/apps/miniprogram/src/pages/pkg-profile/consents/index.scss index 7c1e2a6..7b2b904 100644 --- a/apps/miniprogram/src/pages/pkg-profile/consents/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/consents/index.scss @@ -1,12 +1,7 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; -.consents-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; - padding-bottom: 40px; -} +// PageShell 已接管:min-height, background, padding .page-title { @include section-title; diff --git a/apps/miniprogram/src/pages/pkg-profile/consents/index.tsx b/apps/miniprogram/src/pages/pkg-profile/consents/index.tsx index 11bb2d7..94a96b2 100644 --- a/apps/miniprogram/src/pages/pkg-profile/consents/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/consents/index.tsx @@ -8,6 +8,7 @@ import type { Consent } from '@/services/consent'; import EmptyState from '@/components/EmptyState'; import Loading from '@/components/Loading'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; const CONSENT_TYPE_MAP: Record = { @@ -82,7 +83,7 @@ export default function ConsentList() { }; return ( - + 知情同意 @@ -123,6 +124,6 @@ export default function ConsentList() { )} {loading && } - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/diagnoses/index.scss b/apps/miniprogram/src/pages/pkg-profile/diagnoses/index.scss index c948da3..ccb25fa 100644 --- a/apps/miniprogram/src/pages/pkg-profile/diagnoses/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/diagnoses/index.scss @@ -1,12 +1,7 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; -.diagnoses-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; - padding-bottom: 40px; -} +// PageShell 已接管:min-height, background, padding .page-title { font-family: 'Georgia', 'Times New Roman', serif; diff --git a/apps/miniprogram/src/pages/pkg-profile/diagnoses/index.tsx b/apps/miniprogram/src/pages/pkg-profile/diagnoses/index.tsx index 2a52610..7b3ed00 100644 --- a/apps/miniprogram/src/pages/pkg-profile/diagnoses/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/diagnoses/index.tsx @@ -7,6 +7,7 @@ import { listDiagnoses, Diagnosis } from '../../../services/health-record'; import EmptyState from '../../../components/EmptyState'; import Loading from '../../../components/Loading'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; const TYPE_MAP: Record = { @@ -60,7 +61,7 @@ export default function Diagnoses() { }); return ( - + 诊断记录 @@ -95,6 +96,6 @@ export default function Diagnoses() { )} {loading && } - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/dialysis-prescriptions/index.scss b/apps/miniprogram/src/pages/pkg-profile/dialysis-prescriptions/index.scss index 39a9a52..b81ef49 100644 --- a/apps/miniprogram/src/pages/pkg-profile/dialysis-prescriptions/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/dialysis-prescriptions/index.scss @@ -1,12 +1,7 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; -.dialysis-prescriptions-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; - padding-bottom: 40px; -} +// PageShell 已接管:min-height, background, padding .page-title { @include section-title; diff --git a/apps/miniprogram/src/pages/pkg-profile/dialysis-prescriptions/index.tsx b/apps/miniprogram/src/pages/pkg-profile/dialysis-prescriptions/index.tsx index 28df6ce..8c62176 100644 --- a/apps/miniprogram/src/pages/pkg-profile/dialysis-prescriptions/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/dialysis-prescriptions/index.tsx @@ -8,6 +8,7 @@ import type { DialysisPrescription } from '@/services/dialysis'; import EmptyState from '@/components/EmptyState'; import Loading from '@/components/Loading'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; const STATUS_MAP: Record = { @@ -57,7 +58,7 @@ export default function DialysisPrescriptionList() { const statusInfo = (s: string) => STATUS_MAP[s] || { label: s, cls: '' }; return ( - + 透析处方 @@ -96,6 +97,6 @@ export default function DialysisPrescriptionList() { )} {loading && } - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/dialysis-records/index.scss b/apps/miniprogram/src/pages/pkg-profile/dialysis-records/index.scss index 8e7f9e4..29c140f 100644 --- a/apps/miniprogram/src/pages/pkg-profile/dialysis-records/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/dialysis-records/index.scss @@ -1,12 +1,7 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; -.dialysis-records-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; - padding-bottom: 40px; -} +// PageShell 已接管:min-height, background, padding .page-title { @include section-title; diff --git a/apps/miniprogram/src/pages/pkg-profile/dialysis-records/index.tsx b/apps/miniprogram/src/pages/pkg-profile/dialysis-records/index.tsx index eefcad2..4815185 100644 --- a/apps/miniprogram/src/pages/pkg-profile/dialysis-records/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/dialysis-records/index.tsx @@ -8,6 +8,7 @@ import type { DialysisRecord } from '@/services/dialysis'; import EmptyState from '@/components/EmptyState'; import Loading from '@/components/Loading'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; const TYPE_MAP: Record = { @@ -64,7 +65,7 @@ export default function DialysisRecordList() { const statusInfo = (s: string) => STATUS_MAP[s] || { label: s, cls: '' }; return ( - + 透析记录 @@ -101,6 +102,6 @@ export default function DialysisRecordList() { )} {loading && } - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/events/index.scss b/apps/miniprogram/src/pages/pkg-profile/events/index.scss index d5a2cb0..84048ab 100644 --- a/apps/miniprogram/src/pages/pkg-profile/events/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/events/index.scss @@ -1,9 +1,8 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; +// PageShell 已接管:min-height, background, padding .events-page { - min-height: 100vh; - background: $bg; padding-bottom: 120px; } diff --git a/apps/miniprogram/src/pages/pkg-profile/events/index.tsx b/apps/miniprogram/src/pages/pkg-profile/events/index.tsx index 85da55d..918480b 100644 --- a/apps/miniprogram/src/pages/pkg-profile/events/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/events/index.tsx @@ -6,6 +6,7 @@ import Loading from '@/components/Loading'; import EmptyState from '@/components/EmptyState'; import { useElderClass } from '@/hooks/useElderClass'; import { usePageData } from '@/hooks/usePageData'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; const STATUS_MAP: Record = { @@ -60,7 +61,7 @@ export default function EventsPage() { if (loading) return ; return ( - + 线下活动 参加活动赢取积分 @@ -111,6 +112,6 @@ export default function EventsPage() { })} )} - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/family-add/index.scss b/apps/miniprogram/src/pages/pkg-profile/family-add/index.scss index 7e3c07a..58531c7 100644 --- a/apps/miniprogram/src/pages/pkg-profile/family-add/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/family-add/index.scss @@ -1,10 +1,8 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; +// PageShell 已接管:min-height, background, padding .family-add-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; padding-bottom: 160px; } diff --git a/apps/miniprogram/src/pages/pkg-profile/family-add/index.tsx b/apps/miniprogram/src/pages/pkg-profile/family-add/index.tsx index 1ff5caf..54d1bb1 100644 --- a/apps/miniprogram/src/pages/pkg-profile/family-add/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/family-add/index.tsx @@ -4,6 +4,7 @@ import Taro, { useRouter } from '@tarojs/taro'; import { createPatient, updatePatient, Patient } from '../../../services/patient'; import { useElderClass } from '../../../hooks/useElderClass'; import { useSafeTimeout } from '@/hooks/useSafeTimeout'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; const RELATION_OPTIONS = ['本人', '配偶', '父母', '子女', '其他']; @@ -66,7 +67,7 @@ export default function FamilyAdd() { }; return ( - + {editId ? '编辑就诊人' : '添加就诊人'} @@ -134,6 +135,6 @@ export default function FamilyAdd() { > {submitting ? '提交中...' : editId ? '保存修改' : '确认添加'} - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/family/index.scss b/apps/miniprogram/src/pages/pkg-profile/family/index.scss index 2bf074b..4a5464f 100644 --- a/apps/miniprogram/src/pages/pkg-profile/family/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/family/index.scss @@ -1,10 +1,8 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; +// PageShell 已接管:min-height, background, padding .family-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; padding-bottom: 160px; } diff --git a/apps/miniprogram/src/pages/pkg-profile/family/index.tsx b/apps/miniprogram/src/pages/pkg-profile/family/index.tsx index 13c71ed..df6a614 100644 --- a/apps/miniprogram/src/pages/pkg-profile/family/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/family/index.tsx @@ -6,6 +6,7 @@ import { listPatients, Patient } from '../../../services/patient'; import { useAuthStore } from '../../../stores/auth'; import EmptyState from '../../../components/EmptyState'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; export default function FamilyList() { @@ -60,7 +61,7 @@ export default function FamilyList() { }; return ( - + 就诊人管理 @@ -103,6 +104,6 @@ export default function FamilyList() { 添加就诊人 - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/followups/index.scss b/apps/miniprogram/src/pages/pkg-profile/followups/index.scss index 6ddf344..4cdc77d 100644 --- a/apps/miniprogram/src/pages/pkg-profile/followups/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/followups/index.scss @@ -1,10 +1,7 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; -.my-followups-page { - min-height: 100vh; - background: $bg; -} +// PageShell 已接管:min-height, background, padding .tab-bar { display: flex; diff --git a/apps/miniprogram/src/pages/pkg-profile/followups/index.tsx b/apps/miniprogram/src/pages/pkg-profile/followups/index.tsx index f277795..d4183cf 100644 --- a/apps/miniprogram/src/pages/pkg-profile/followups/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/followups/index.tsx @@ -7,6 +7,7 @@ import EmptyState from '../../../components/EmptyState'; import ErrorState from '../../../components/ErrorState'; import Loading from '../../../components/Loading'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; const TABS = [ @@ -60,7 +61,7 @@ export default function MyFollowUps() { }; return ( - + {TABS.map((tab) => ( )} - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/health-records/index.scss b/apps/miniprogram/src/pages/pkg-profile/health-records/index.scss index f95610a..ac71eb5 100644 --- a/apps/miniprogram/src/pages/pkg-profile/health-records/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/health-records/index.scss @@ -1,12 +1,7 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; -.health-records-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; - padding-bottom: 40px; -} +// PageShell 已接管:min-height, background, padding .page-title { font-family: 'Georgia', 'Times New Roman', serif; diff --git a/apps/miniprogram/src/pages/pkg-profile/health-records/index.tsx b/apps/miniprogram/src/pages/pkg-profile/health-records/index.tsx index 611e2e0..a98d955 100644 --- a/apps/miniprogram/src/pages/pkg-profile/health-records/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/health-records/index.tsx @@ -7,6 +7,7 @@ import { listHealthRecords, HealthRecord } from '../../../services/health-record import EmptyState from '../../../components/EmptyState'; import Loading from '../../../components/Loading'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; const TYPE_MAP: Record = { @@ -54,7 +55,7 @@ export default function HealthRecords() { }); return ( - + 健康记录 @@ -84,6 +85,6 @@ export default function HealthRecords() { )} {loading && } - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/medication/index.scss b/apps/miniprogram/src/pages/pkg-profile/medication/index.scss index e9a2989..f9cafb8 100644 --- a/apps/miniprogram/src/pages/pkg-profile/medication/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/medication/index.scss @@ -1,10 +1,8 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; +// PageShell 已接管:min-height, background, padding .medication-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; padding-bottom: 160px; } diff --git a/apps/miniprogram/src/pages/pkg-profile/medication/index.tsx b/apps/miniprogram/src/pages/pkg-profile/medication/index.tsx index e42ef41..36effee 100644 --- a/apps/miniprogram/src/pages/pkg-profile/medication/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/medication/index.tsx @@ -12,6 +12,7 @@ import { type MedicationReminder, } from '../../../services/medication-reminder'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; export default function MedicationReminder() { @@ -100,17 +101,17 @@ export default function MedicationReminder() { if (loading) { return ( - + 用药提醒 加载中... - + ); } return ( - + 用药提醒 @@ -199,6 +200,6 @@ export default function MedicationReminder() { 添加提醒 )} - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/reports/index.scss b/apps/miniprogram/src/pages/pkg-profile/reports/index.scss index f5bdd88..329070a 100644 --- a/apps/miniprogram/src/pages/pkg-profile/reports/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/reports/index.scss @@ -1,12 +1,7 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; -.my-reports-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; - padding-bottom: 40px; -} +// PageShell 已接管:min-height, background, padding .page-title { @include section-title; diff --git a/apps/miniprogram/src/pages/pkg-profile/reports/index.tsx b/apps/miniprogram/src/pages/pkg-profile/reports/index.tsx index e04a8f8..9c82281 100644 --- a/apps/miniprogram/src/pages/pkg-profile/reports/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/reports/index.tsx @@ -7,6 +7,7 @@ import { listReports, LabReport } from '../../../services/report'; import EmptyState from '../../../components/EmptyState'; import Loading from '../../../components/Loading'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; export default function MyReports() { @@ -64,7 +65,7 @@ export default function MyReports() { }; return ( - + 检查报告 @@ -100,6 +101,6 @@ export default function MyReports() { {loading && ( )} - + ); } diff --git a/apps/miniprogram/src/pages/pkg-profile/settings/index.scss b/apps/miniprogram/src/pages/pkg-profile/settings/index.scss index e082de5..764aa20 100644 --- a/apps/miniprogram/src/pages/pkg-profile/settings/index.scss +++ b/apps/miniprogram/src/pages/pkg-profile/settings/index.scss @@ -1,11 +1,7 @@ @import '../../../styles/variables.scss'; @import '../../../styles/mixins.scss'; -.settings-page { - min-height: 100vh; - background: $bg; - padding: 32px 24px; -} +// PageShell 已接管:min-height, background, padding .page-title { @include section-title; diff --git a/apps/miniprogram/src/pages/pkg-profile/settings/index.tsx b/apps/miniprogram/src/pages/pkg-profile/settings/index.tsx index 870cce0..7a57481 100644 --- a/apps/miniprogram/src/pages/pkg-profile/settings/index.tsx +++ b/apps/miniprogram/src/pages/pkg-profile/settings/index.tsx @@ -4,6 +4,7 @@ import Taro from '@tarojs/taro'; import { useAuthStore } from '../../../stores/auth'; import { invalidateHeadersCache, clearRequestCache } from '@/services/request'; import { useElderClass } from '../../../hooks/useElderClass'; +import PageShell from '@/components/ui/PageShell'; import './index.scss'; export default function Settings() { @@ -65,7 +66,7 @@ export default function Settings() { }; return ( - + 设置 @@ -97,6 +98,6 @@ export default function Settings() { 退出登录 - + ); }